lkml.org 
[lkml]   [2019]   [Dec]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH v3 11/16] usb: phy: tegra: Disable VBUS regulator on tegra_usb_phy_init failure
Date
VBUS regulator should be turned off in a case of error.

Signed-off-by: Dmitry Osipenko <digetx@gmail.com>
---
drivers/usb/phy/phy-tegra-usb.c | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/drivers/usb/phy/phy-tegra-usb.c b/drivers/usb/phy/phy-tegra-usb.c
index cc6cca4dcecb..f7e7df812f83 100644
--- a/drivers/usb/phy/phy-tegra-usb.c
+++ b/drivers/usb/phy/phy-tegra-usb.c
@@ -851,14 +851,14 @@ static int tegra_usb_phy_init(struct usb_phy *u_phy)
dev_err(phy->u_phy.dev, "Invalid pll_u parent rate %ld\n",
parent_rate);
err = -EINVAL;
- goto fail;
+ goto disable_clk;
}

err = regulator_enable(phy->vbus);
if (err) {
dev_err(phy->u_phy.dev,
"Failed to enable USB VBUS regulator: %d\n", err);
- goto fail;
+ goto disable_clk;
}

if (phy->is_ulpi_phy)
@@ -866,7 +866,7 @@ static int tegra_usb_phy_init(struct usb_phy *u_phy)
else
err = utmip_pad_open(phy);
if (err)
- goto fail;
+ goto disable_vbus;

err = tegra_usb_phy_power_on(phy);
if (err)
@@ -879,7 +879,11 @@ static int tegra_usb_phy_init(struct usb_phy *u_phy)
ulpi_close(phy);
else
utmip_pad_close(phy);
-fail:
+
+disable_vbus:
+ regulator_disable(phy->vbus);
+
+disable_clk:
clk_disable_unprepare(phy->pll_u);

phy->freq = NULL;
--
2.24.0
\
 
 \ /
  Last update: 2019-12-28 21:37    [W:0.086 / U:7.924 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site