Pull pvops into release branch

[linux-2.6] / arch / arm / mach-pxa / clock.c

diff --git a/arch/arm/mach-pxa/clock.c b/arch/arm/mach-pxa/clock.c
index 180c8bb530415ceaf493b44342064497563e5254..b4d04955dcb0a08774e0214aaac6a7c1453c2d52 100644 (file)
--- a/arch/arm/mach-pxa/clock.c
+++ b/arch/arm/mach-pxa/clock.c
@@ -47,6 +47,9 @@ struct clk *clk_get(struct device *dev, const char *id)
                clk = p;
        mutex_unlock(&clocks_mutex);
 
+       if (!IS_ERR(clk) && clk->ops == NULL)
+               clk = clk->other;
+
        return clk;
 }
 EXPORT_SYMBOL(clk_get);