| Message ID | 1388420272-5132-1-git-send-email-ivo.g.dimitrov.75@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Mon 2013-12-30 18:17:52, Ivaylo Dimitrov wrote: > From: Ivaylo Dimitrov <freemangordon@abv.bg> > > Commit c37dd677988ca50bc8bc60ab5ab053720583c168 fixes the unbalanced > unlock in acx565akm_enable but introduces another problem - if > acx565akm_panel_power_on exits early, the mutex is not unlocked. Fix > that by unlocking the mutex on early return. Also add mutex protection in > acx565akm_panel_power_off and remove an unused variable > > Signed-off-by: Ivaylo Dimitrov <freemangordon@abv.bg> Reviewed-by: Pavel Machek <pavel@ucw.cz>
On 04.01.2014 14:51, Pavel Machek wrote: > On Mon 2013-12-30 18:17:52, Ivaylo Dimitrov wrote: >> From: Ivaylo Dimitrov <freemangordon@abv.bg> >> >> Commit c37dd677988ca50bc8bc60ab5ab053720583c168 fixes the unbalanced >> unlock in acx565akm_enable but introduces another problem - if >> acx565akm_panel_power_on exits early, the mutex is not unlocked. Fix >> that by unlocking the mutex on early return. Also add mutex protection in >> acx565akm_panel_power_off and remove an unused variable >> >> Signed-off-by: Ivaylo Dimitrov <freemangordon@abv.bg> > Reviewed-by: Pavel Machek <pavel@ucw.cz> Hmm, I introduced a bug with that patch (recursive lock), will send a new version that fixes it Regards, Ivo -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/video/omap2/displays-new/panel-sony-acx565akm.c b/drivers/video/omap2/displays-new/panel-sony-acx565akm.c index d94f35d..a093d3a 100644 --- a/drivers/video/omap2/displays-new/panel-sony-acx565akm.c +++ b/drivers/video/omap2/displays-new/panel-sony-acx565akm.c @@ -535,6 +535,7 @@ static int acx565akm_panel_power_on(struct omap_dss_device *dssdev) r = in->ops.sdi->enable(in); if (r) { + mutex_unlock(&ddata->mutex); pr_err("%s sdi enable failed\n", __func__); return r; } @@ -546,6 +547,7 @@ static int acx565akm_panel_power_on(struct omap_dss_device *dssdev) gpio_set_value(ddata->reset_gpio, 1); if (ddata->enabled) { + mutex_unlock(&ddata->mutex); dev_dbg(&ddata->spi->dev, "panel already enabled\n"); return 0; } @@ -578,10 +580,14 @@ static void acx565akm_panel_power_off(struct omap_dss_device *dssdev) struct panel_drv_data *ddata = to_panel_data(dssdev); struct omap_dss_device *in = ddata->in; + mutex_lock(&ddata->mutex); + dev_dbg(dssdev->dev, "%s\n", __func__); - if (!ddata->enabled) + if (!ddata->enabled) { + mutex_unlock(&ddata->mutex); return; + } set_display_state(ddata, 0); set_sleep_mode(ddata, 1); @@ -601,11 +607,13 @@ static void acx565akm_panel_power_off(struct omap_dss_device *dssdev) msleep(100); in->ops.sdi->disable(in); + + mutex_unlock(&ddata->mutex); + } static int acx565akm_enable(struct omap_dss_device *dssdev) { - struct panel_drv_data *ddata = to_panel_data(dssdev); int r; dev_dbg(dssdev->dev, "%s\n", __func__);