From: Michael Grzeschik <m.grzeschik@pengutronix.de>
To: barebox@lists.infradead.org
Subject: [PATCH v2 1/5] usb: dwc2: cleanup on error for deferred probing
Date: Thu, 17 Dec 2020 12:07:27 +0100 [thread overview]
Message-ID: <20201217110731.14914-2-m.grzeschik@pengutronix.de> (raw)
In-Reply-To: <20201217110731.14914-1-m.grzeschik@pengutronix.de>
The driver needs to cleanup the resources if an error occurred. Otherwise,
on deferred probing, it will fail to take the resources for a second time.
Signed-off-by: Michael Grzeschik <m.grzeschik@pengutronix.de>
---
v1 -> v2: fixed missing change of release_region tag for phy_init error
drivers/usb/dwc2/dwc2.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/drivers/usb/dwc2/dwc2.c b/drivers/usb/dwc2/dwc2.c
index bd33334a83..82b5ef2813 100644
--- a/drivers/usb/dwc2/dwc2.c
+++ b/drivers/usb/dwc2/dwc2.c
@@ -53,12 +53,12 @@ static int dwc2_probe(struct device_d *dev)
dwc2->phy = phy_optional_get(dev, "usb2-phy");
if (IS_ERR(dwc2->phy)) {
ret = PTR_ERR(dwc2->phy);
- return ret;
+ goto release_region;
}
ret = phy_init(dwc2->phy);
if (ret)
- goto err_phy_init;
+ goto release_region;
ret = phy_power_on(dwc2->phy);
if (ret)
goto err_phy_power;
@@ -100,7 +100,8 @@ error:
phy_power_off(dwc2->phy);
err_phy_power:
phy_exit(dwc2->phy);
-err_phy_init:
+release_region:
+ release_region(iores);
return ret;
}
--
2.29.2
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
next prev parent reply other threads:[~2020-12-17 11:07 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-17 11:07 [PATCH v2 0/5] dwc2: improve gadget support Michael Grzeschik
2020-12-17 11:07 ` Michael Grzeschik [this message]
2020-12-17 11:07 ` [PATCH v2 2/5] usb: dwc2: add clk dependency for probe via oftree Michael Grzeschik
2021-01-06 8:57 ` Sascha Hauer
2021-01-06 9:42 ` [PATCH] fixup! " Michael Grzeschik
2020-12-17 11:07 ` [PATCH v2 3/5] usb: dwc2: add reset controller " Michael Grzeschik
2020-12-17 11:07 ` [PATCH v2 4/5] usb: dwc2: update the dr_mode on set_mode callback Michael Grzeschik
2020-12-17 11:07 ` [PATCH v2 5/5] usb: dwc2: add support to force gadget mode Michael Grzeschik
2020-12-17 11:39 ` [PATCH v2 0/5] dwc2: improve gadget support Jules Maselbas
2021-01-06 10:00 ` Sascha Hauer
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=20201217110731.14914-2-m.grzeschik@pengutronix.de \
--to=m.grzeschik@pengutronix.de \
--cc=barebox@lists.infradead.org \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox