From c11aeb55a7019f07a974905d6f30f0bd11a2e0aa Mon Sep 17 00:00:00 2001 From: Jingoo Han Date: Wed, 27 Feb 2013 17:02:39 -0800 Subject: [PATCH] --- yaml --- r: 359263 b: refs/heads/master c: f7a3c997af148b13a6225898c9bde1cb858924ba h: refs/heads/master i: 359261: 949fe3a0b58f09cb548ac21225e1840845e6048d 359259: df7256daae31b91e9d8fd5b91cd4bca0a1753dae 359255: 4df92431462d81e7ccfbea168feabe9f3d222534 359247: 00b2ac8eacb3a255a6fe9d5147c27c9588d8a8f3 359231: 963d80a038f090b203633f9d950c34ae03527c0f v: v3 --- [refs] | 2 +- trunk/drivers/video/backlight/ams369fg06.c | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 0727f37c7130..01f93f550803 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: be987d9f80354e2e919926349282facd74992f90 +refs/heads/master: f7a3c997af148b13a6225898c9bde1cb858924ba diff --git a/trunk/drivers/video/backlight/ams369fg06.c b/trunk/drivers/video/backlight/ams369fg06.c index d29e49443f29..c02aa2c2575a 100644 --- a/trunk/drivers/video/backlight/ams369fg06.c +++ b/trunk/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; }