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

Commit 90c69064 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 

* 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6:
  USB: additional regression fix for device removal
parents 31cb8528 ca5c485f

drivers/usb/core/message.c

+8 −1
Original line number Diff line number Diff line
@@ -1147,6 +1147,14 @@ void usb_disable_device(struct usb_device *dev, int skip_ep0) 
	 * any drivers bound to them (a key side effect)

	 */

	if (dev->actconfig) {

		/*

		 * FIXME: In order to avoid self-deadlock involving the

		 * bandwidth_mutex, we have to mark all the interfaces

		 * before unregistering any of them.

		 */

		for (i = 0; i < dev->actconfig->desc.bNumInterfaces; i++)

			dev->actconfig->interface[i]->unregistering = 1;



		for (i = 0; i < dev->actconfig->desc.bNumInterfaces; i++) {

			struct usb_interface	*interface;
@@ -1156,7 +1164,6 @@ void usb_disable_device(struct usb_device *dev, int skip_ep0) 
				continue;

			dev_dbg(&dev->dev, "unregistering interface %s\n",

				dev_name(&interface->dev));

			interface->unregistering = 1;

			remove_intf_ep_devs(interface);

			device_del(&interface->dev);

		}