]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
USB: fix regression occurring during device removal
authorAlan Stern <stern@rowland.harvard.edu>
Fri, 1 Jul 2011 20:43:02 +0000 (16:43 -0400)
committerGreg Kroah-Hartman <gregkh@suse.de>
Fri, 1 Jul 2011 21:20:39 +0000 (14:20 -0700)
This patch (as1476) fixes a regression introduced by
fccf4e86200b8f5edd9a65da26f150e32ba79808 (USB: Free bandwidth when
usb_disable_device is called).  usb_disconnect() grabs the
bandwidth_mutex before calling usb_disable_device(), which calls down
indirectly to usb_set_interface(), which tries to acquire the
bandwidth_mutex.

The fix causes usb_set_interface() to return early when it is called
for an interface that has already been unregistered, which is what
happens in usb_disable_device().

Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Tested-by: Sarah Sharp <sarah.a.sharp@linux.intel.com>
Cc: stable <stable@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/usb/core/message.c

index 64c7ab4702df39ae27b6cad3f72d42a6608e591e..e0719b4ee1891e095b0c6ca455858412fea0f9b4 100644 (file)
@@ -1286,6 +1286,8 @@ int usb_set_interface(struct usb_device *dev, int interface, int alternate)
                        interface);
                return -EINVAL;
        }
+       if (iface->unregistering)
+               return -ENODEV;
 
        alt = usb_altnum_to_altsetting(iface, alternate);
        if (!alt) {