projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
0185b1b
)
ahci: imx: add missing clk_disable_unprepare() on error in imx_sata_enable()
author
Wei Yongjun
<
[email protected]
>
Wed, 30 Jul 2014 00:54:07 +0000
(08:54 +0800)
committer
Tejun Heo
<
[email protected]
>
Wed, 30 Jul 2014 16:04:22 +0000
(12:04 -0400)
Add the missing clk_disable_unprepare() before return from
imx_sata_enable() in the phy reset error handling case.
Signed-off-by: Wei Yongjun <
[email protected]
>
Acked-by: Shawn Guo <
[email protected]
>
Signed-off-by: Tejun Heo <
[email protected]
>
drivers/ata/ahci_imx.c
patch
|
blob
|
history
diff --git
a/drivers/ata/ahci_imx.c
b/drivers/ata/ahci_imx.c
index 685a4db030b14e22fa693ed9e24a011a8ebea3aa..e7be1f87d3e553cb8cc651b0d72ea034c70035f3 100644
(file)
--- a/
drivers/ata/ahci_imx.c
+++ b/
drivers/ata/ahci_imx.c
@@
-257,7
+257,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
;
}
}
@@
-265,6
+265,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);