From: Uwe Kleine-König Date: Thu, 10 Dec 2015 13:11:43 +0000 (+0100) Subject: fbdev: omap2: panel-dpi: in .disable first disable backlight then display X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=7f496cfd6bd5a74c9cd50252b3a0141709cbf020;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git 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 Signed-off-by: Tomi Valkeinen --- 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;