1 files changed, 11 insertions, 10 deletions

diff --git a/arch/arm/mach-omap1/clock.c b/arch/arm/mach-omap1/clock.c
index dafe4f71d15f..336e51dc6127 100644
--- a/arch/arm/mach-omap1/clock.c
+++ b/arch/arm/mach-omap1/clock.c
@@ -590,27 +590,28 @@ static void omap1_init_ext_clk(struct clk * clk)
 static int omap1_clk_enable(struct clk *clk)
 {
         int ret = 0;
+
         if (clk->usecount++ == 0) {
-                if (likely(clk->parent)) {
+                if (clk->parent) {
                         ret = omap1_clk_enable(clk->parent);
-
-                        if (unlikely(ret != 0)) {
-                                clk->usecount--;
-                                return ret;
-                        }
+                        if (ret)
+                                goto err;
 
                         if (clk->flags & CLOCK_NO_IDLE_PARENT)
                                 omap1_clk_deny_idle(clk->parent);
                 }
 
                 ret = clk->ops->enable(clk);
-
-                if (unlikely(ret != 0) && clk->parent) {
-                        omap1_clk_disable(clk->parent);
-                        clk->usecount--;
+                if (ret) {
+                        if (clk->parent)
+                                omap1_clk_disable(clk->parent);
+                        goto err;
                 }
         }
+        return ret;
 
+err:
+        clk->usecount--;
         return ret;
 }