summaryrefslogtreecommitdiff
path: root/drivers/video
diff options
context:
space:
mode:
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>2015-12-10 16:11:43 +0300
committerTomi Valkeinen <tomi.valkeinen@ti.com>2015-12-29 12:06:31 +0300
commit7f496cfd6bd5a74c9cd50252b3a0141709cbf020 (patch)
tree3e1dd989526d2760bc1fc98a83ad4aa83ae81db8 /drivers/video
parent85d90b12518f3dfaed23e83dd8b163bc6271725e (diff)
downloadlinux-7f496cfd6bd5a74c9cd50252b3a0141709cbf020.tar.xz
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)
if (!omapdss_device_is_enabled(dssdev))
return;
- if (ddata->enable_gpio)
- gpiod_set_value_cansleep(ddata->enable_gpio, 0);
-
if (gpio_is_valid(ddata->backlight_gpio))
gpio_set_value_cansleep(ddata->backlight_gpio, 0);
+ if (ddata->enable_gpio)
+ gpiod_set_value_cansleep(ddata->enable_gpio, 0);
+
in->ops.dpi->disable(in);
dssdev->state = OMAP_DSS_DISPLAY_DISABLED;