diff --git a/[refs] b/[refs] index fafce94b2fdd..8a6de05e8e64 100644 --- 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 index 3b85e2a70323..1e0097de3a23 100644 --- 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); }