]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
ahci: imx: add missing clk_disable_unprepare() on error in imx_sata_enable()
authorWei Yongjun <yongjun_wei@trendmicro.com.cn>
Wed, 30 Jul 2014 00:54:07 +0000 (08:54 +0800)
committerNitin Garg <nitin.garg@freescale.com>
Fri, 16 Jan 2015 03:17:28 +0000 (21:17 -0600)
Add the missing clk_disable_unprepare() before return from
imx_sata_enable() in the phy reset error handling case.

Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Acked-by: Shawn Guo <shawn.guo@freescale.com>
Signed-off-by: Tejun Heo <tj@kernel.org>
(cherry picked from commit 19f5be0f40922717e2b6e39a9822e7e7f30fd81f)

drivers/ata/ahci_imx.c

index dae1d5632b3de226481090fdf4adc1286046aeaa..1e5fa5f21aff05c55d71dbc800ad4d0c53952a93 100644 (file)
@@ -259,7 +259,7 @@ static int imx_sata_enable(struct ahci_host_priv *hpriv)
                ret = imx_sata_phy_reset(hpriv);
                if (ret) {
                        dev_err(dev, "failed to reset phy: %d\n", ret);
-                       goto disable_regulator;
+                       goto disable_clk;
                }
        }
 
@@ -267,6 +267,8 @@ static int imx_sata_enable(struct ahci_host_priv *hpriv)
 
        return 0;
 
+disable_clk:
+       clk_disable_unprepare(imxpriv->sata_ref_clk);
 disable_regulator:
        if (hpriv->target_pwr)
                regulator_disable(hpriv->target_pwr);