From: Paul Walmsley <paul@pwsan.com>
Date: Thu, 15 May 2008 20:48:20 +0000 (-0600)
Subject: clock34xx.c: fix spinlock reentry in omap3_noncore_dpll_enable()
X-Git-Tag: v2.6.26-omap1~123^2~89
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=4a2f6d0a24b5f13622983dcddbf65f9c8d1cc4da;p=linux-2.6-omap-h63xx.git

clock34xx.c: fix spinlock reentry in omap3_noncore_dpll_enable()

omap3_noncore_dpll_enable() calls clk_get_rate(), which causes an attempt
to re-enter the clockfw_lock spinlock.  Fix by calling
omap2_get_dpll_rate() instead.

Signed-off-by: Paul Walmsley <paul@pwsan.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
---

diff --git a/arch/arm/mach-omap2/clock34xx.c b/arch/arm/mach-omap2/clock34xx.c
index 670c945880c..71357db3f8d 100644
--- a/arch/arm/mach-omap2/clock34xx.c
+++ b/arch/arm/mach-omap2/clock34xx.c
@@ -273,7 +273,7 @@ static int omap3_noncore_dpll_enable(struct clk *clk)
 	if (clk == &dpll3_ck)
 		return -EINVAL;
 
-	if (clk->parent->rate == clk_get_rate(clk))
+	if (clk->parent->rate == omap2_get_dpll_rate(clk))
 		r = _omap3_noncore_dpll_bypass(clk);
 	else
 		r = _omap3_noncore_dpll_lock(clk);