diff options
author | Ricardo Perez Olivares <x0081762@ti.com> | 2010-04-16 12:19:35 -0500 |
---|---|---|
committer | Ricardo Perez Olivares <x0081762@ti.com> | 2010-04-16 12:19:35 -0500 |
commit | f147102f80979c6130246486132173cc7b8c63ad (patch) | |
tree | 5bbb0f463a9eae7be2c46a1444645c319cc34561 /drivers/video/omap2/dss/dpi.c | |
parent | d0ca5a9cbb057a8311c414ef0b9786ef8ceb531c (diff) | |
parent | 12e5ffce7afb76cc85cab5109d45b04545333ead (diff) |
Merge branch 'display-next' of git://dev.omapzoom.org/pub/scm/axelcx/kernel-display into L24x5P1ti-2.6.33-rc2-omap4-L24.5-p1
Diffstat (limited to 'drivers/video/omap2/dss/dpi.c')
-rw-r--r-- | drivers/video/omap2/dss/dpi.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/video/omap2/dss/dpi.c b/drivers/video/omap2/dss/dpi.c index 4c5b6dd0636c..857e7194811f 100644 --- a/drivers/video/omap2/dss/dpi.c +++ b/drivers/video/omap2/dss/dpi.c @@ -171,7 +171,9 @@ static int dpi_set_mode(struct omap_dss_device *dssdev) err2: dss_select_clk_source_dsi(lcd_channel_ix, false, false); err1: +#ifdef CONFIG_OMAP2_DSS_USE_DSI_PLL dsi_pll_uninit(lcd_channel_ix); +#endif err0: dss_clk_disable(DSS_CLK_ICK | DSS_CLK_FCK1); return r; |