From c65098adf08a45601de20e466aca0405542b532f Mon Sep 17 00:00:00 2001 From: Julia Lawall Date: Tue, 20 Jul 2010 19:22:44 -0300 Subject: [PATCH] --- yaml --- r: 202112 b: refs/heads/master c: 5c79b496a713dac1a706845bdd047aae15421ef5 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/video/omap2/displays/panel-acx565akm.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 0ebeab4539ba..6dd15dcb062a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: febe2ea10e041c014b295a0321f7ec62c05b7e3f +refs/heads/master: 5c79b496a713dac1a706845bdd047aae15421ef5 diff --git a/trunk/drivers/video/omap2/displays/panel-acx565akm.c b/trunk/drivers/video/omap2/displays/panel-acx565akm.c index 1f8eb70e2937..07fbb8a733bb 100644 --- a/trunk/drivers/video/omap2/displays/panel-acx565akm.c +++ b/trunk/drivers/video/omap2/displays/panel-acx565akm.c @@ -592,7 +592,7 @@ static int acx_panel_power_on(struct omap_dss_device *dssdev) r = omapdss_sdi_display_enable(dssdev); if (r) { pr_err("%s sdi enable failed\n", __func__); - return r; + goto fail_unlock; } /*FIXME tweak me */ @@ -633,6 +633,8 @@ static int acx_panel_power_on(struct omap_dss_device *dssdev) return acx565akm_bl_update_status(md->bl_dev); fail: omapdss_sdi_display_disable(dssdev); +fail_unlock: + mutex_unlock(&md->mutex); return r; }