diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-05-19 01:32:52 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-05-19 01:32:52 +0200 |
| commit | f06b9f3ced17dfb559af2c0c5db2d68e939f06e6 (patch) | |
| tree | afd1cd52582f1c5088f891b08b13a3f63c597f45 /drivers/net/wireless/libertas/if_usb.c | |
| parent | USB: gpio_vbus: wakeup support on GPIO VBUS interrupts (diff) | |
| parent | USB: Disable hub-initiated LPM for comms devices. (diff) | |
| download | linux-f06b9f3ced17dfb559af2c0c5db2d68e939f06e6.tar.xz linux-f06b9f3ced17dfb559af2c0c5db2d68e939f06e6.zip | |
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/net/wireless/libertas/if_usb.c')
| -rw-r--r-- | drivers/net/wireless/libertas/if_usb.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireless/libertas/if_usb.c b/drivers/net/wireless/libertas/if_usb.c index 74da5f1ea243..76ea66d53b9c 100644 --- a/drivers/net/wireless/libertas/if_usb.c +++ b/drivers/net/wireless/libertas/if_usb.c @@ -1180,6 +1180,7 @@ static struct usb_driver if_usb_driver = { .suspend = if_usb_suspend, .resume = if_usb_resume, .reset_resume = if_usb_resume, + .disable_hub_initiated_lpm = 1, }; module_usb_driver(if_usb_driver); |