diff options
| author | Roger Quadros <rogerq@ti.com> | 2014-08-04 12:44:46 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-09-05 16:34:18 -0700 |
| commit | 323308e6f5ea6e0fa311478581c87b09fa219f9c (patch) | |
| tree | 5b0f6f5866c078ff925f1c6b69341dc6e3e2b6ff | |
| parent | a9cedf67702b5298f730e15ccda60753b9cb7f96 (diff) | |
| download | kernel-common-323308e6f5ea6e0fa311478581c87b09fa219f9c.tar.gz kernel-common-323308e6f5ea6e0fa311478581c87b09fa219f9c.tar.bz2 kernel-common-323308e6f5ea6e0fa311478581c87b09fa219f9c.zip | |
usb: hub: Prevent hub autosuspend if usbcore.autosuspend is -1
commit bdd405d2a5287bdb9b04670ea255e1f122138e66 upstream.
If user specifies that USB autosuspend must be disabled by module
parameter "usbcore.autosuspend=-1" then we must prevent
autosuspend of USB hub devices as well.
commit 596d789a211d introduced in v3.8 changed the original behaivour
and stopped respecting the usbcore.autosuspend parameter for hubs.
Fixes: 596d789a211d "USB: set hub's default autosuspend delay as 0"
Signed-off-by: Roger Quadros <rogerq@ti.com>
Tested-by: Michael Welling <mwelling@emacinc.com>
Acked-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/usb/core/hub.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c index 5607dce169b0..d098bcfae33d 100644 --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c @@ -1695,8 +1695,12 @@ static int hub_probe(struct usb_interface *intf, const struct usb_device_id *id) * - Change autosuspend delay of hub can avoid unnecessary auto * suspend timer for hub, also may decrease power consumption * of USB bus. + * + * - If user has indicated to prevent autosuspend by passing + * usbcore.autosuspend = -1 then keep autosuspend disabled. */ - pm_runtime_set_autosuspend_delay(&hdev->dev, 0); + if (hdev->dev.power.autosuspend_delay >= 0) + pm_runtime_set_autosuspend_delay(&hdev->dev, 0); /* * Hubs have proper suspend/resume support, except for root hubs |