From 87f3efc26e3f4d8f171c56bdd819088f79e1110c Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Wed, 27 Sep 2017 10:06:37 +0200 Subject: usbgadget: unregister when usb_composite_probe() fails 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 --- 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) -- cgit v1.2.3