From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1dxv2W-0005oc-8y for barebox@lists.infradead.org; Fri, 29 Sep 2017 13:09:15 +0000 Date: Fri, 29 Sep 2017 15:08:50 +0200 From: Oleksij Rempel Message-ID: <20170929130850.harquud63kzl5tks@pengutronix.de> References: <20170927091245.9476-1-s.hauer@pengutronix.de> <20170927091245.9476-5-s.hauer@pengutronix.de> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20170927091245.9476-5-s.hauer@pengutronix.de> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "barebox" Errors-To: barebox-bounces+u.kleine-koenig=pengutronix.de@lists.infradead.org Subject: Re: [PATCH 4/4] usbgadget: unregister when usb_composite_probe() fails To: Sascha Hauer Cc: Barebox List On Wed, Sep 27, 2017 at 11:12:45AM +0200, Sascha Hauer wrote: > 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) > -- > 2.11.0 Reviewed-by: Oleksij Rempel -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | _______________________________________________ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox