* [PATCH -next] phy: meson8b-usb2: fix missing clk_disable_unprepare() on error
@ 2016-10-22 14:33 Wei Yongjun
2016-11-15 13:42 ` Kishon Vijay Abraham I
0 siblings, 1 reply; 2+ messages in thread
From: Wei Yongjun @ 2016-10-22 14:33 UTC (permalink / raw)
To: linus-amlogic
From: Wei Yongjun <weiyongjun1@huawei.com>
Fix the missing clk_disable_unprepare() before return from
phy_meson8b_usb2_power_on() in the error handling case.
Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
---
drivers/phy/phy-meson8b-usb2.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/drivers/phy/phy-meson8b-usb2.c b/drivers/phy/phy-meson8b-usb2.c
index 73bf632..dca3947 100644
--- a/drivers/phy/phy-meson8b-usb2.c
+++ b/drivers/phy/phy-meson8b-usb2.c
@@ -158,6 +158,7 @@ static int phy_meson8b_usb2_power_on(struct phy *phy)
ret = clk_prepare_enable(priv->clk_usb);
if (ret) {
dev_err(&phy->dev, "Failed to enable USB DDR clock\n");
+ clk_disable_unprepare(priv->clk_usb_general);
return ret;
}
@@ -190,6 +191,8 @@ static int phy_meson8b_usb2_power_on(struct phy *phy)
if (phy_meson8b_usb2_read(priv, REG_ADP_BC) &
REG_ADP_BC_ACA_PIN_FLOAT) {
dev_warn(&phy->dev, "USB ID detect failed!\n");
+ clk_disable_unprepare(priv->clk_usb);
+ clk_disable_unprepare(priv->clk_usb_general);
return -EINVAL;
}
}
^ permalink raw reply related [flat|nested] 2+ messages in thread* [PATCH -next] phy: meson8b-usb2: fix missing clk_disable_unprepare() on error
2016-10-22 14:33 [PATCH -next] phy: meson8b-usb2: fix missing clk_disable_unprepare() on error Wei Yongjun
@ 2016-11-15 13:42 ` Kishon Vijay Abraham I
0 siblings, 0 replies; 2+ messages in thread
From: Kishon Vijay Abraham I @ 2016-11-15 13:42 UTC (permalink / raw)
To: linus-amlogic
On Saturday 22 October 2016 08:03 PM, Wei Yongjun wrote:
> From: Wei Yongjun <weiyongjun1@huawei.com>
>
> Fix the missing clk_disable_unprepare() before return from
> phy_meson8b_usb2_power_on() in the error handling case.
>
> Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
merged, thanks.
-Kishon
> ---
> drivers/phy/phy-meson8b-usb2.c | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/drivers/phy/phy-meson8b-usb2.c b/drivers/phy/phy-meson8b-usb2.c
> index 73bf632..dca3947 100644
> --- a/drivers/phy/phy-meson8b-usb2.c
> +++ b/drivers/phy/phy-meson8b-usb2.c
> @@ -158,6 +158,7 @@ static int phy_meson8b_usb2_power_on(struct phy *phy)
> ret = clk_prepare_enable(priv->clk_usb);
> if (ret) {
> dev_err(&phy->dev, "Failed to enable USB DDR clock\n");
> + clk_disable_unprepare(priv->clk_usb_general);
> return ret;
> }
>
> @@ -190,6 +191,8 @@ static int phy_meson8b_usb2_power_on(struct phy *phy)
> if (phy_meson8b_usb2_read(priv, REG_ADP_BC) &
> REG_ADP_BC_ACA_PIN_FLOAT) {
> dev_warn(&phy->dev, "USB ID detect failed!\n");
> + clk_disable_unprepare(priv->clk_usb);
> + clk_disable_unprepare(priv->clk_usb_general);
> return -EINVAL;
> }
> }
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-11-15 13:42 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-10-22 14:33 [PATCH -next] phy: meson8b-usb2: fix missing clk_disable_unprepare() on error Wei Yongjun
2016-11-15 13:42 ` Kishon Vijay Abraham I
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).