drivers/video/backlight/ams369fg06.c: make power_on() call optional
authorJingoo Han <jg1.han@samsung.com>
Thu, 28 Feb 2013 01:02:39 +0000 (17:02 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 28 Feb 2013 03:10:08 +0000 (19:10 -0800)
This patch makes power_on() call optional.  The voltage source can be
provided to some boards using ams369fg06 panel, thus in this case, power
on/off sequence is not necessary.

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
drivers/video/backlight/ams369fg06.c

index d29e49443f299cd6234d4f26167beac3bb6f2263..c02aa2c2575aa33e0ffd4ae835903c9fc08d8292 100644 (file)
@@ -317,10 +317,7 @@ static int ams369fg06_power_on(struct ams369fg06 *lcd)
        pd = lcd->lcd_pd;
        bd = lcd->bd;
 
-       if (!pd->power_on) {
-               dev_err(lcd->dev, "power_on is NULL.\n");
-               return -EINVAL;
-       } else {
+       if (pd->power_on) {
                pd->power_on(lcd->ld, 1);
                msleep(pd->power_on_delay);
        }
@@ -370,7 +367,8 @@ static int ams369fg06_power_off(struct ams369fg06 *lcd)
 
        msleep(pd->power_off_delay);
 
-       pd->power_on(lcd->ld, 0);
+       if (pd->power_on)
+               pd->power_on(lcd->ld, 0);
 
        return 0;
 }