From: Dmitry Osipenko <digetx@gmail.com>
To: "Greg Kroah-Hartman" <gregkh@linuxfoundation.org>,
"Peter Chen" <Peter.Chen@nxp.com>,
"Thierry Reding" <thierry.reding@gmail.com>,
"Jonathan Hunter" <jonathanh@nvidia.com>,
"Felipe Balbi" <balbi@kernel.org>,
"Michał Mirosław" <mirq-linux@rere.qmqm.pl>
Cc: linux-usb@vger.kernel.org, linux-tegra@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: [PATCH v4 14/20] usb: phy: tegra: Disable VBUS regulator on tegra_usb_phy_init failure
Date: Mon, 6 Jan 2020 04:34:10 +0300 [thread overview]
Message-ID: <20200106013416.9604-15-digetx@gmail.com> (raw)
In-Reply-To: <20200106013416.9604-1-digetx@gmail.com>
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 c431968d0433..90b42e963a1e 100644
--- a/drivers/usb/phy/phy-tegra-usb.c
+++ b/drivers/usb/phy/phy-tegra-usb.c
@@ -864,20 +864,20 @@ 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) {
err = utmip_pad_open(phy);
if (err)
- goto fail;
+ goto disable_vbus;
}
err = tegra_usb_phy_power_on(phy);
@@ -889,7 +889,11 @@ static int tegra_usb_phy_init(struct usb_phy *u_phy)
close_phy:
if (!phy->is_ulpi_phy)
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
next prev parent reply other threads:[~2020-01-06 1:34 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-06 1:33 [PATCH v4 00/20] NVIDIA Tegra USB2 drivers clean up Dmitry Osipenko
2020-01-06 1:33 ` [PATCH v4 01/20] dt-binding: usb: ci-hdrc-usb2: Document NVIDIA Tegra support Dmitry Osipenko
2020-01-06 1:33 ` [PATCH v4 02/20] usb: host: ehci-tegra: Correct teardown order of driver's removal Dmitry Osipenko
2020-01-06 1:33 ` [PATCH v4 03/20] usb: phy: tegra: Clean up ulpi_phy_power_off Dmitry Osipenko
2020-01-06 1:34 ` [PATCH v4 04/20] usb: phy: tegra: Keep track of power on-off state Dmitry Osipenko
2020-01-06 1:34 ` [PATCH v4 05/20] usb: phy: tegra: Hook up init/shutdown callbacks Dmitry Osipenko
2020-01-06 1:34 ` [PATCH v4 06/20] usb: phy: tegra: Perform general clean up of the code Dmitry Osipenko
2020-01-06 1:34 ` [PATCH v4 07/20] usb: phy: tegra: Clean up included headers Dmitry Osipenko
2020-01-06 1:34 ` [PATCH v4 08/20] usb: phy: tegra: Use relaxed versions of readl/writel Dmitry Osipenko
2020-01-06 1:34 ` [PATCH v4 09/20] usb: phy: tegra: Use generic stub for a missing VBUS regulator Dmitry Osipenko
2020-01-06 1:34 ` [PATCH v4 10/20] usb: ulpi: Add resource-managed variant of otg_ulpi_create() Dmitry Osipenko
2020-01-06 1:34 ` [PATCH v4 11/20] usb: phy: tegra: Use devm_otg_ulpi_create() Dmitry Osipenko
2020-01-06 1:34 ` [PATCH v4 12/20] usb: phy: tegra: Use u32 for hardware register variables Dmitry Osipenko
2020-01-06 1:34 ` [PATCH v4 13/20] usb: phy: tegra: Use device-tree notion of reset-GPIO's active-state Dmitry Osipenko
2020-01-06 1:34 ` Dmitry Osipenko [this message]
2020-01-06 1:34 ` [PATCH v4 15/20] usb: phy: tegra: Move utmip_pad_count checking under lock Dmitry Osipenko
2020-01-06 1:34 ` [PATCH v4 16/20] usb: phy: tegra: Keep CPU interrupts enabled Dmitry Osipenko
2020-01-06 1:34 ` [PATCH v4 17/20] usb: chipidea: tegra: Stop managing PHY's power Dmitry Osipenko
2020-01-06 1:34 ` [PATCH v4 18/20] usb: chipidea: tegra: Add USB_TEGRA_PHY to driver's dependencies Dmitry Osipenko
2020-01-06 1:34 ` [PATCH v4 19/20] usb: host: ehci-tegra: Stop managing PHY's power Dmitry Osipenko
2020-01-06 1:34 ` [PATCH v4 20/20] usb: host: ehci-tegra: Remove unused fields from tegra_ehci_hcd Dmitry Osipenko
2020-01-06 15:16 ` Alan Stern
2020-01-07 16:13 ` Dmitry Osipenko
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200106013416.9604-15-digetx@gmail.com \
--to=digetx@gmail.com \
--cc=Peter.Chen@nxp.com \
--cc=balbi@kernel.org \
--cc=gregkh@linuxfoundation.org \
--cc=jonathanh@nvidia.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tegra@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=mirq-linux@rere.qmqm.pl \
--cc=thierry.reding@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.