diff options
| author |   Jingoo Han <jg1.han@samsung.com> | 2013-02-27 17:02:39 -0800 |
|---|---|---|
| committer |   Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-27 19:10:08 -0800 |
| commit | f7a3c997af148b13a6225898c9bde1cb858924ba (patch) | |
| tree | 7895f6dc8a468f428ff0751ad31b3958c6c5bea5 /drivers/video/backlight/ams369fg06.c | |
| parent | checkpatch: improve CamelCase test for Page (diff) | |
| download | linux-dev-f7a3c997af148b13a6225898c9bde1cb858924ba.tar.xz linux-dev-f7a3c997af148b13a6225898c9bde1cb858924ba.zip | |
drivers/video/backlight/ams369fg06.c: make power_on() call optional
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>
Diffstat (limited to '')
| -rw-r--r-- | drivers/video/backlight/ams369fg06.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/video/backlight/ams369fg06.c b/drivers/video/backlight/ams369fg06.c index d29e49443f29..c02aa2c2575a 100644 --- a/drivers/video/backlight/ams369fg06.c +++ b/drivers/video/backlight/ams369fg06.c @@ -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; } |