diff options
Diffstat (limited to 'arch/arm/mach-omap2/display.c')
-rw-r--r-- | arch/arm/mach-omap2/display.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/display.c b/arch/arm/mach-omap2/display.c index af1ed7d24a1f..5a3afd2b737d 100644 --- a/arch/arm/mach-omap2/display.c +++ b/arch/arm/mach-omap2/display.c | |||
@@ -488,7 +488,7 @@ int omap_dss_reset(struct omap_hwmod *oh) | |||
488 | 488 | ||
489 | for (i = oh->opt_clks_cnt, oc = oh->opt_clks; i > 0; i--, oc++) | 489 | for (i = oh->opt_clks_cnt, oc = oh->opt_clks; i > 0; i--, oc++) |
490 | if (oc->_clk) | 490 | if (oc->_clk) |
491 | clk_enable(oc->_clk); | 491 | clk_prepare_enable(oc->_clk); |
492 | 492 | ||
493 | dispc_disable_outputs(); | 493 | dispc_disable_outputs(); |
494 | 494 | ||
@@ -515,7 +515,7 @@ int omap_dss_reset(struct omap_hwmod *oh) | |||
515 | 515 | ||
516 | for (i = oh->opt_clks_cnt, oc = oh->opt_clks; i > 0; i--, oc++) | 516 | for (i = oh->opt_clks_cnt, oc = oh->opt_clks; i > 0; i--, oc++) |
517 | if (oc->_clk) | 517 | if (oc->_clk) |
518 | clk_disable(oc->_clk); | 518 | clk_disable_unprepare(oc->_clk); |
519 | 519 | ||
520 | r = (c == MAX_MODULE_SOFTRESET_WAIT) ? -ETIMEDOUT : 0; | 520 | r = (c == MAX_MODULE_SOFTRESET_WAIT) ? -ETIMEDOUT : 0; |
521 | 521 | ||