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>

diff --git a/drivers/video/omap2/dss/dsi.c b/drivers/video/omap2/dss/dsi.c
index 613796b54f0792122a6ff4efedf07584d3321893..72b859cc3a5c6cb4eb1a320b250a7ecfa5d882ce 100644 (file)
--- 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;
        }