Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f362a475 authored by Felipe Balbi's avatar Felipe Balbi Committed by Greg Kroah-Hartman
Browse files

usb: musb: fix hanging when rmmod gadget driver 



If we try to modprobe a second gadget driver before
rmmoding the first one, the reference for the first
gadget driver would get NULLed avoiding usb to change
gadget drivers later.

Cc: David Brownell <david-b@pacbell.net>
Cc: Tony Lindgren <tony@atomide.com>
Signed-off-by: default avatarFelipe Balbi <felipe.balbi@nokia.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 550a7375

drivers/usb/musb/musb_gadget.c

+7 −9
Original line number Diff line number Diff line
@@ -1710,7 +1710,7 @@ int usb_gadget_register_driver(struct usb_gadget_driver *driver) 


	spin_unlock_irqrestore(&musb->lock, flags);



	if (retval == 0)

	if (retval == 0) {

		retval = driver->bind(&musb->g);

		if (retval != 0) {

			DBG(3, "bind to driver %s failed --> %d\n",
@@ -1719,8 +1719,6 @@ int usb_gadget_register_driver(struct usb_gadget_driver *driver) 
			musb->g.dev.driver = NULL;

		}



	/* start peripheral and/or OTG engines */

	if (retval == 0) {

		spin_lock_irqsave(&musb->lock, flags);



		/* REVISIT always use otg_set_peripheral(), handling