1 files changed, 4 insertions, 4 deletions

diff --git a/drivers/clk/ti/clkctrl.c b/drivers/clk/ti/clkctrl.c
index 96d65a1cf7be..8e834317c97d 100644
--- a/drivers/clk/ti/clkctrl.c
+++ b/drivers/clk/ti/clkctrl.c
@@ -137,9 +137,6 @@ static int _omap4_clkctrl_clk_enable(struct clk_hw *hw)
         int ret;
         union omap4_timeout timeout = { 0 };
 
-        if (!clk->enable_bit)
-                return 0;
-
         if (clk->clkdm) {
                 ret = ti_clk_ll_ops->clkdm_clk_enable(clk->clkdm, hw->clk);
                 if (ret) {
@@ -151,6 +148,9 @@ static int _omap4_clkctrl_clk_enable(struct clk_hw *hw)
                 }
         }
 
+        if (!clk->enable_bit)
+                return 0;
+
         val = ti_clk_ll_ops->clk_readl(&clk->enable_reg);
 
         val &= ~OMAP4_MODULEMODE_MASK;
@@ -179,7 +179,7 @@ static void _omap4_clkctrl_clk_disable(struct clk_hw *hw)
         union omap4_timeout timeout = { 0 };
 
         if (!clk->enable_bit)
-                return;
+                goto exit;
 
         val = ti_clk_ll_ops->clk_readl(&clk->enable_reg);