diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-06-14 00:23:12 (GMT) |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-06-14 00:23:12 (GMT) |
| commit | 57e04bdb3ea67d9e2e58b412eb21772188467df4 (patch) | |
| tree | c9175f5a24b4cdba72d42e76768a9499c29b2ede /drivers/usb/core | |
| parent | afff07e61a5243e14ee3f0a272a0380cd744a8a3 (diff) | |
| parent | 622eb783fe6ff4c1baa47db16c3a5db97f9e6e50 (diff) | |
| download | linux-57e04bdb3ea67d9e2e58b412eb21772188467df4.tar.xz | |
Merge tag 'for-usb-linus-2012-06-13' of git://git.kernel.org/pub/scm/linux/kernel/git/sarah/xhci into usb-linus
xhci: Bug fixes for 3.5
Hi Greg,
Here's five bug fixes for 3.5. They fix some memory leaks in the
bandwidth calculation code, fix a couple bugs in the USB3 Link PM
patchset, and make system suspend and resume work on platforms with the
AsMedia ASM1042 xHCI host controller.
Sarah Sharp
Diffstat (limited to 'drivers/usb/core')
| -rw-r--r-- | drivers/usb/core/hub.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c index 04fb834..25a7422 100644 --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c @@ -3379,7 +3379,7 @@ int usb_disable_lpm(struct usb_device *udev) return 0; udev->lpm_disable_count++; - if ((udev->u1_params.timeout == 0 && udev->u1_params.timeout == 0)) + if ((udev->u1_params.timeout == 0 && udev->u2_params.timeout == 0)) return 0; /* If LPM is enabled, attempt to disable it. */ |