summaryrefslogtreecommitdiffstats
path: root/drivers/video
diff options
context:
space:
mode:
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>2015-12-10 08:11:43 -0500
committerTomi Valkeinen <tomi.valkeinen@ti.com>2015-12-29 04:06:31 -0500
commit7f496cfd6bd5a74c9cd50252b3a0141709cbf020 (patch)
tree3e1dd989526d2760bc1fc98a83ad4aa83ae81db8 /drivers/video
parent85d90b12518f3dfaed23e83dd8b163bc6271725e (diff)
fbdev: omap2: panel-dpi: in .disable first disable backlight then display
This makes .disable operate in reverse order compared to .enable. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Diffstat (limited to 'drivers/video')
-rw-r--r--drivers/video/fbdev/omap2/displays-new/panel-dpi.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/video/fbdev/omap2/displays-new/panel-dpi.c b/drivers/video/fbdev/omap2/displays-new/panel-dpi.c
index f7be3489f744..06b6e611e4b2 100644
--- a/drivers/video/fbdev/omap2/displays-new/panel-dpi.c
+++ b/drivers/video/fbdev/omap2/displays-new/panel-dpi.c
@@ -102,12 +102,12 @@ static void panel_dpi_disable(struct omap_dss_device *dssdev)
102 if (!omapdss_device_is_enabled(dssdev)) 102 if (!omapdss_device_is_enabled(dssdev))
103 return; 103 return;
104 104
105 if (ddata->enable_gpio)
106 gpiod_set_value_cansleep(ddata->enable_gpio, 0);
107
108 if (gpio_is_valid(ddata->backlight_gpio)) 105 if (gpio_is_valid(ddata->backlight_gpio))
109 gpio_set_value_cansleep(ddata->backlight_gpio, 0); 106 gpio_set_value_cansleep(ddata->backlight_gpio, 0);
110 107
108 if (ddata->enable_gpio)
109 gpiod_set_value_cansleep(ddata->enable_gpio, 0);
110
111 in->ops.dpi->disable(in); 111 in->ops.dpi->disable(in);
112 112
113 dssdev->state = OMAP_DSS_DISPLAY_DISABLED; 113 dssdev->state = OMAP_DSS_DISPLAY_DISABLED;