summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorVille Syrjälä <ville.syrjala@nokia.com>2010-04-22 22:50:04 +0200
committerTomi Valkeinen <tomi.valkeinen@nokia.com>2010-08-05 16:51:23 +0300
commit481dfa0eb915fb248c93ea37cd6e669b91ee9f8e (patch)
treed230081e72590cc1f30a1e2ecf6d40d5275bb0fd /drivers
parent1e8943dbae98f48fc485fb9a671e94972b234cb2 (diff)
downloadlinux-481dfa0eb915fb248c93ea37cd6e669b91ee9f8e.tar.bz2
OMAP: DSS2: DSI: Disable PCKFREE on error
Do not leave the free running pixel clock enabled if the DSI PLL reset times out. Signed-off-by: Ville Syrjälä <ville.syrjala@nokia.com> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@nokia.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/video/omap2/dss/dsi.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/video/omap2/dss/dsi.c b/drivers/video/omap2/dss/dsi.c
index 613796b54f07..72b859cc3a5c 100644
--- a/drivers/video/omap2/dss/dsi.c
+++ b/drivers/video/omap2/dss/dsi.c
@@ -1100,6 +1100,7 @@ int dsi_pll_init(struct omap_dss_device *dssdev, bool enable_hsclk,
if (wait_for_bit_change(DSI_PLL_STATUS, 0, 1) != 1) {
DSSERR("PLL not coming out of reset.\n");
r = -ENODEV;
+ dispc_pck_free_enable(0);
goto err1;
}