| Message ID | 1449753107-11410-1-git-send-email-uwe@kleine-koenig.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 10/12/15 15:11, Uwe Kleine-König wrote: > From: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> > > This makes .disable operate in reverse order compared to .enable. > > Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> > --- > drivers/video/fbdev/omap2/displays-new/panel-dpi.c | 6 +++--- > 1 file 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; > Thanks, queued for 4.5. Tomi
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;