aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video
diff options
context:
space:
mode:
authorVille Syrjälä <ville.syrjala@nokia.com>2010-03-10 18:24:54 +0100
committerTomi Valkeinen <tomi.valkeinen@nokia.com>2010-05-18 14:14:30 +0300
commit6df37271f879f14119a0605549f1a2574e83b4fe (patch)
tree77be10a5b7eb8a9744b12c28efc6bb57c0162d37 /drivers/video
parenta3201a0eaed38dd7ece72393a778b4408ec79627 (diff)
downloadkernel_samsung_smdk4412-6df37271f879f14119a0605549f1a2574e83b4fe.zip
kernel_samsung_smdk4412-6df37271f879f14119a0605549f1a2574e83b4fe.tar.gz
kernel_samsung_smdk4412-6df37271f879f14119a0605549f1a2574e83b4fe.tar.bz2
OMAP: DSS2: Taal: Fix DSI bus locking problem
If omapdss_dsi_display_enable() failed the DSI bus was left locked. Also if the operation failed later omapdss_dsi_display_disable() would get called without holding the bus lock. Signed-off-by: Ville Syrjälä <ville.syrjala@nokia.com> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@nokia.com>
Diffstat (limited to 'drivers/video')
-rw-r--r--drivers/video/omap2/displays/panel-taal.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/video/omap2/displays/panel-taal.c b/drivers/video/omap2/displays/panel-taal.c
index 1799096..aaf5d30 100644
--- a/drivers/video/omap2/displays/panel-taal.c
+++ b/drivers/video/omap2/displays/panel-taal.c
@@ -702,10 +702,9 @@ static int taal_power_on(struct omap_dss_device *dssdev)
return 0;
err:
- dsi_bus_unlock();
-
omapdss_dsi_display_disable(dssdev);
err0:
+ dsi_bus_unlock();
if (dssdev->platform_disable)
dssdev->platform_disable(dssdev);