---

yaml --- r: 371335 b: refs/heads/master c: be9a006 h: refs/heads/master i: 371333: 9b64d13 371331: e4cf9cc 371327: 6d7635e v: v3
git-mirror · Apr 3, 2013 · ca0dc63 · ca0dc63
1 parent 05bf473
commit ca0dc63
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 12 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 57bc6c517bd930ef5db527dd4efe4f7ce36b025e
+refs/heads/master: be9a0067c5dca8b96b19abc41d28d4b089973c22
diff --git a/trunk/drivers/video/omap2/displays/panel-nec-nl8048hl11-01b.c b/trunk/drivers/video/omap2/displays/panel-nec-nl8048hl11-01b.c
@@ -133,18 +133,11 @@ static int nec_8048_panel_power_on(struct omap_dss_device *dssdev)
 	if (r)
 		goto err0;
 
-	if (dssdev->platform_enable) {
-		r = dssdev->platform_enable(dssdev);
-		if (r)
-			goto err1;
-	}
-
 	if (gpio_is_valid(pd->res_gpio))
 		gpio_set_value_cansleep(pd->res_gpio, 1);
 
 	return 0;
-err1:
-	omapdss_dpi_display_disable(dssdev);
+
 err0:
 	return r;
 }
@@ -159,9 +152,6 @@ static void nec_8048_panel_power_off(struct omap_dss_device *dssdev)
 	if (gpio_is_valid(pd->res_gpio))
 		gpio_set_value_cansleep(pd->res_gpio, 0);
 
-	if (dssdev->platform_disable)
-		dssdev->platform_disable(dssdev);
-
 	omapdss_dpi_display_disable(dssdev);
 }