From 4a2f6d0a24b5f13622983dcddbf65f9c8d1cc4da Mon Sep 17 00:00:00 2001 From: Paul Walmsley Date: Thu, 15 May 2008 14:48:20 -0600 Subject: [PATCH] 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 Signed-off-by: Tony Lindgren --- arch/arm/mach-omap2/clock34xx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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); -- 2.41.1