Merge tag 'v3.18-rc1' into for_next

[firefly-linux-kernel-4.4.55.git] / drivers / video / backlight / omap1_bl.c

diff --git a/drivers/video/backlight/omap1_bl.c b/drivers/video/backlight/omap1_bl.c
index a0dcd88ac74fce38d77531df242a690c4bc1eb12..546d94df21d53ac436891273828058043acb2c2d 100644 (file)
--- a/drivers/video/backlight/omap1_bl.c
+++ b/drivers/video/backlight/omap1_bl.c
@@ -120,6 +120,7 @@ static int omapbl_update_status(struct backlight_device *dev)
 static int omapbl_get_intensity(struct backlight_device *dev)
 {
        struct omap_backlight *bl = bl_get_data(dev);
+
        return bl->current_intensity;
 }