diff options
author | Jingoo Han <jg1.han@samsung.com> | 2013-02-27 20:02:39 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-27 22:10:08 -0500 |
commit | f7a3c997af148b13a6225898c9bde1cb858924ba (patch) | |
tree | 7895f6dc8a468f428ff0751ad31b3958c6c5bea5 /drivers/video | |
parent | be987d9f80354e2e919926349282facd74992f90 (diff) |
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 'drivers/video')
-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) | |||
317 | pd = lcd->lcd_pd; | 317 | pd = lcd->lcd_pd; |
318 | bd = lcd->bd; | 318 | bd = lcd->bd; |
319 | 319 | ||
320 | if (!pd->power_on) { | 320 | if (pd->power_on) { |
321 | dev_err(lcd->dev, "power_on is NULL.\n"); | ||
322 | return -EINVAL; | ||
323 | } else { | ||
324 | pd->power_on(lcd->ld, 1); | 321 | pd->power_on(lcd->ld, 1); |
325 | msleep(pd->power_on_delay); | 322 | msleep(pd->power_on_delay); |
326 | } | 323 | } |
@@ -370,7 +367,8 @@ static int ams369fg06_power_off(struct ams369fg06 *lcd) | |||
370 | 367 | ||
371 | msleep(pd->power_off_delay); | 368 | msleep(pd->power_off_delay); |
372 | 369 | ||
373 | pd->power_on(lcd->ld, 0); | 370 | if (pd->power_on) |
371 | pd->power_on(lcd->ld, 0); | ||
374 | 372 | ||
375 | return 0; | 373 | return 0; |
376 | } | 374 | } |