diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-05 20:57:45 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-05 20:57:45 -0700 |
| commit | a2fa83faf47b514ab947cea916d3691b66525073 (patch) | |
| tree | d08743acf3957b0f103c832a31d4bc0a26ef57e7 /drivers/usb/core/message.c | |
| parent | 2d12a18b89f5e3c0cce1981cc257228bfbf9039f (diff) | |
| parent | e534c5b831c8b8e9f5edee5c8a37753c808b80dc (diff) | |
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: fix regression occurring during device removal
USB: fsl_udc_core: fix build breakage when building for ARM arch
Diffstat (limited to 'drivers/usb/core/message.c')
| -rw-r--r-- | drivers/usb/core/message.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/usb/core/message.c b/drivers/usb/core/message.c index 64c7ab4702df..e0719b4ee189 100644 --- a/drivers/usb/core/message.c +++ b/drivers/usb/core/message.c @@ -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) { |