This is a note to let you know that I've just added the patch titled
USB: Enable LPM after a failed probe.
to the 3.6-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
usb-enable-lpm-after-a-failed-probe.patch
and it can be found in the queue-3.6 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <[email protected]> know about it.
>From d01f87c0ffa96cb44faa78710711eb6e974b891c Mon Sep 17 00:00:00 2001
From: Sarah Sharp <[email protected]>
Date: Thu, 4 Oct 2012 09:53:43 -0700
Subject: USB: Enable LPM after a failed probe.
From: Sarah Sharp <[email protected]>
commit d01f87c0ffa96cb44faa78710711eb6e974b891c upstream.
Before a driver is probed, we want to disable USB 3.0 Link Power
Management (LPM), in case the driver needs hub-initiated LPM disabled.
After the probe finishes, we want to attempt to re-enable LPM, order to
balance the LPM ref count.
When a probe fails (such as when libusual doesn't want to bind to a USB
3.0 mass storage device), make sure to balance the LPM ref counts by
re-enabling LPM.
This patch 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 <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
---
drivers/usb/core/driver.c | 4 ++++
1 file changed, 4 insertions(+)
--- a/drivers/usb/core/driver.c
+++ b/drivers/usb/core/driver.c
@@ -372,6 +372,10 @@ static int usb_probe_interface(struct de
intf->condition = USB_INTERFACE_UNBOUND;
usb_cancel_queued_reset(intf);
+ /* If the LPM disable succeeded, balance the ref counts. */
+ if (!lpm_disable_error)
+ usb_unlocked_enable_lpm(udev);
+
/* Unbound interfaces are always runtime-PM-disabled and -suspended */
if (driver->supports_autosuspend)
pm_runtime_disable(dev);
Patches currently in stable-queue which might be from
[email protected] are
queue-3.6/usb-send-set-sel-before-enabling-parent-u1-u2-timeout.patch
queue-3.6/usb-enable-lpm-after-a-failed-probe.patch
queue-3.6/usb-don-t-enable-lpm-if-the-exit-latency-is-zero.patch
queue-3.6/usb-host-xhci-new-system-added-for-compliance-mode-patch-on-sn65lvpe502cp.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
