diff options
| author | Sarah Sharp <sarah.a.sharp@linux.intel.com> | 2012-07-05 14:09:30 -0700 |
|---|---|---|
| committer | Sarah Sharp <sarah.a.sharp@linux.intel.com> | 2012-07-11 07:06:47 -0400 |
| commit | 249719121bc2b841bdfcab5eb21b10d8b871743b (patch) | |
| tree | 4f843a0963d59bbe21751737f4482847123e2b65 | |
| parent | 9cf65991dd93ac3d5f97f536171c388918b7c1a9 (diff) | |
| download | op-kernel-dev-249719121bc2b841bdfcab5eb21b10d8b871743b.zip op-kernel-dev-249719121bc2b841bdfcab5eb21b10d8b871743b.tar.gz | |
USB: Fix LPM disable count mismatch on driver unbind.
When a user runs `echo 0 > bConfigurationValue` for a USB 3.0 device,
usb_disable_device() is called. This function disables all drivers,
deallocates interfaces, and sets the device configuration value to 0
(unconfigured).
With the new scheme to ensure that unconfigured devices have LPM
disabled, usb_disable_device() must call usb_unlocked_disable_lpm() once
it unconfigures the device.
This commit should be backported to kernels as old as 3.5, that contain
the commit 8306095fd2c1100e8244c09bf560f97aca5a311d "USB: Disable USB
3.0 LPM in critical sections."
Signed-off-by: Sarah Sharp <sarah.a.sharp@linux.intel.com>
Cc: stable@vger.kernel.org
| -rw-r--r-- | drivers/usb/core/message.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/usb/core/message.c b/drivers/usb/core/message.c index 3723904..c0877b7 100644 --- a/drivers/usb/core/message.c +++ b/drivers/usb/core/message.c @@ -1174,6 +1174,7 @@ void usb_disable_device(struct usb_device *dev, int skip_ep0) put_device(&dev->actconfig->interface[i]->dev); dev->actconfig->interface[i] = NULL; } + usb_unlocked_disable_lpm(dev); dev->actconfig = NULL; if (dev->state == USB_STATE_CONFIGURED) usb_set_device_state(dev, USB_STATE_ADDRESS); |
