From: Sascha Hauer <s.hauer@pengutronix.de>
To: Barebox List <barebox@lists.infradead.org>
Cc: Oleksij Rempel <ore@pengutronix.de>
Subject: [PATCH 4/4] usbgadget: unregister when usb_composite_probe() fails
Date: Wed, 27 Sep 2017 11:12:45 +0200 [thread overview]
Message-ID: <20170927091245.9476-5-s.hauer@pengutronix.de> (raw)
In-Reply-To: <20170927091245.9476-1-s.hauer@pengutronix.de>
When usb_multi_register() returns an error it can't be called again
as we do not unregister the driver properly. Fix this.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
drivers/usb/gadget/multi.c | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/drivers/usb/gadget/multi.c b/drivers/usb/gadget/multi.c
index 6385c16186..6eeeb4e982 100644
--- a/drivers/usb/gadget/multi.c
+++ b/drivers/usb/gadget/multi.c
@@ -234,6 +234,8 @@ static struct usb_composite_driver multi_driver = {
int usb_multi_register(struct f_multi_opts *opts)
{
+ int ret;
+
if (gadget_multi_opts) {
pr_err("USB multi gadget already registered\n");
return -EBUSY;
@@ -241,7 +243,13 @@ int usb_multi_register(struct f_multi_opts *opts)
gadget_multi_opts = opts;
- return usb_composite_probe(&multi_driver);
+ ret = usb_composite_probe(&multi_driver);
+ if (ret) {
+ usb_composite_unregister(&multi_driver);
+ gadget_multi_opts = NULL;
+ }
+
+ return ret;
}
void usb_multi_unregister(void)
--
2.11.0
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
next prev parent reply other threads:[~2017-09-27 9:13 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-09-27 9:12 usbgadget fix some crashes Sascha Hauer
2017-09-27 9:12 ` [PATCH 1/4] usbgadget: autostart: Handle errors in file list gracefully Sascha Hauer
2017-09-29 13:02 ` Oleksij Rempel
2017-09-27 9:12 ` [PATCH 2/4] usbgadget: do not register when no functions present Sascha Hauer
2017-09-29 13:05 ` Oleksij Rempel
2017-09-27 9:12 ` [PATCH 3/4] usbgadget: only set to peripheral mode when error checking is done Sascha Hauer
2017-09-29 13:06 ` Oleksij Rempel
2017-09-27 9:12 ` Sascha Hauer [this message]
2017-09-29 13:08 ` [PATCH 4/4] usbgadget: unregister when usb_composite_probe() fails Oleksij Rempel
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=20170927091245.9476-5-s.hauer@pengutronix.de \
--to=s.hauer@pengutronix.de \
--cc=barebox@lists.infradead.org \
--cc=ore@pengutronix.de \
/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