Skip to content

Commit

Permalink
drivers/video/backlight/ams369fg06.c: make power_on() call optional
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Jingoo Han authored and Linus Torvalds committed Feb 28, 2013
1 parent be987d9 commit f7a3c99
Showing 1 changed file with 3 additions and 5 deletions.
8 changes: 3 additions & 5 deletions drivers/video/backlight/ams369fg06.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down Expand Up @@ -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;
}
Expand Down

0 comments on commit f7a3c99

Please sign in to comment.