---

yaml --- r: 359263 b: refs/heads/master c: f7a3c99 h: refs/heads/master i: 359261: 949fe3a 359259: df7256d 359255: 4df9243 359247: 00b2ac8 359231: 963d80a v: v3
git-mirror · Feb 28, 2013 · c11aeb5 · c11aeb5
1 parent 1b371ce
commit c11aeb5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git 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
@@ -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;
 }