* Ruslan Bilovol <ruslan.bilovol@xxxxxx> [120612 10:42]: > If the clocks are enabled and we want to enable them again > omap4430_phy_set_clk disables them. > > Fix this - so now if we try to enable already enabled clocks > it works correctly. Sounds like Felipe is on vacation. Trying to figure out if this is something for the fixes branch: What happens if this not fixed, do you get some error? Was this caused by some recent commit? Regards, Tony > Signed-off-by: Ruslan Bilovol <ruslan.bilovol@xxxxxx> > --- > arch/arm/mach-omap2/omap_phy_internal.c | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/arch/arm/mach-omap2/omap_phy_internal.c b/arch/arm/mach-omap2/omap_phy_internal.c > index 4c90477..0196683 100644 > --- a/arch/arm/mach-omap2/omap_phy_internal.c > +++ b/arch/arm/mach-omap2/omap_phy_internal.c > @@ -97,7 +97,7 @@ int omap4430_phy_set_clk(struct device *dev, int on) > clk_enable(clk48m); > clk_enable(clk32k); > state = 1; > - } else if (state) { > + } else if (!on && state) { > /* Disable the phy clocks */ > clk_disable(phyclk); > clk_disable(clk48m); > -- > 1.7.1 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-omap" in > the body of a message to majordomo@xxxxxxxxxxxxxxx > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html