public inbox for linux-omap@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH] clock34xx.c: fix spinlock reentry in omap3_noncore_dpll_enable()
@ 2008-05-15 20:48 Paul Walmsley
  2008-05-16 17:49 ` Tony Lindgren
  0 siblings, 1 reply; 2+ messages in thread
From: Paul Walmsley @ 2008-05-15 20:48 UTC (permalink / raw)
  To: linux-omap


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>
---

 arch/arm/mach-omap2/clock34xx.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/arch/arm/mach-omap2/clock34xx.c b/arch/arm/mach-omap2/clock34xx.c
index 670c945..71357db 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);

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH] clock34xx.c: fix spinlock reentry in omap3_noncore_dpll_enable()
  2008-05-15 20:48 [PATCH] clock34xx.c: fix spinlock reentry in omap3_noncore_dpll_enable() Paul Walmsley
@ 2008-05-16 17:49 ` Tony Lindgren
  0 siblings, 0 replies; 2+ messages in thread
From: Tony Lindgren @ 2008-05-16 17:49 UTC (permalink / raw)
  To: Paul Walmsley; +Cc: linux-omap

* Paul Walmsley <paul@pwsan.com> [080515 13:50]:
> 
> 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.

Pushing.

Tony

> Signed-off-by: Paul Walmsley <paul@pwsan.com>
> ---
> 
>  arch/arm/mach-omap2/clock34xx.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> 
> diff --git a/arch/arm/mach-omap2/clock34xx.c b/arch/arm/mach-omap2/clock34xx.c
> index 670c945..71357db 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);
> --
> To unsubscribe from this list: send the line "unsubscribe linux-omap" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2008-05-16 17:49 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-05-15 20:48 [PATCH] clock34xx.c: fix spinlock reentry in omap3_noncore_dpll_enable() Paul Walmsley
2008-05-16 17:49 ` Tony Lindgren

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox