OMAP3 clock: put DPLL into bypass if bypass rate = clk->rate, not hardware rate

[linux-2.6-omap-h63xx.git] / arch / arm / mach-omap2 / clock34xx.c

diff --git a/arch/arm/mach-omap2/clock34xx.c b/arch/arm/mach-omap2/clock34xx.c
index c89d6bcb197ca3069775b7704f233eaab2bb0c83..df258f762031bba6971e3eb9e7916dc2cd4a7913 100644 (file)
--- a/arch/arm/mach-omap2/clock34xx.c
+++ b/arch/arm/mach-omap2/clock34xx.c
@@ -281,9 +281,7 @@ static int omap3_noncore_dpll_enable(struct clk *clk)
        if (!dd)
                return -EINVAL;
 
-       rate = omap2_get_dpll_rate(clk);
-
-       if (dd->bypass_clk->rate == rate)
+       if (clk->rate == dd->bypass_clk->rate)
                r = _omap3_noncore_dpll_bypass(clk);
        else
                r = _omap3_noncore_dpll_lock(clk);