diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-05-18 16:32:52 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-05-18 16:32:52 -0700 |
| commit | f06b9f3ced17dfb559af2c0c5db2d68e939f06e6 (patch) | |
| tree | afd1cd52582f1c5088f891b08b13a3f63c597f45 /drivers/usb/class | |
| parent | 7cbb062ade87b987a24aa834bbde32ad8374a4cf (diff) | |
| parent | e1f12eb6ba6f1e74007eb01ed26fad7c5239d62b (diff) | |
| download | linux-f06b9f3ced17dfb559af2c0c5db2d68e939f06e6.tar.bz2 | |
Merge tag 'for-usb-next-2012-05-18' of git://git.kernel.org/pub/scm/linux/kernel/git/sarah/xhci into usb-next
xhci: Link PM and bug fixes for 3.5.
Hi Greg,
Here's the final Link Power Management patches, along with a couple of bug
fixes that have been sitting in my queue. I've fixed all the comments that
Alan and Andiry had on the Link PM patches, so I think they're ready to go.
Sarah Sharp
Diffstat (limited to 'drivers/usb/class')
| -rw-r--r-- | drivers/usb/class/cdc-acm.c | 1 | ||||
| -rw-r--r-- | drivers/usb/class/cdc-wdm.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c index b32ccb461019..f2a120eea9d4 100644 --- a/drivers/usb/class/cdc-acm.c +++ b/drivers/usb/class/cdc-acm.c @@ -1664,6 +1664,7 @@ static struct usb_driver acm_driver = { #ifdef CONFIG_PM .supports_autosuspend = 1, #endif + .disable_hub_initiated_lpm = 1, }; /* diff --git a/drivers/usb/class/cdc-wdm.c b/drivers/usb/class/cdc-wdm.c index 631bb952d0f6..ea8b304f0e85 100644 --- a/drivers/usb/class/cdc-wdm.c +++ b/drivers/usb/class/cdc-wdm.c @@ -1034,6 +1034,7 @@ static struct usb_driver wdm_driver = { .post_reset = wdm_post_reset, .id_table = wdm_ids, .supports_autosuspend = 1, + .disable_hub_initiated_lpm = 1, }; module_usb_driver(wdm_driver); |