summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@oracle.com>2012-05-22 19:54:34 +0200
committerSarah Sharp <sarah.a.sharp@linux.intel.com>2012-06-14 01:37:21 +0200
commit55558c33d6d46cb6f426b729f4119e3b2f12f02b (patch)
tree985981b5e279a96198c727e67de95b7030e968c1 /drivers
parentMerge tag 'fixes-for-v3.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/g... (diff)
downloadlinux-55558c33d6d46cb6f426b729f4119e3b2f12f02b.tar.xz
linux-55558c33d6d46cb6f426b729f4119e3b2f12f02b.zip
USB: Checking the wrong variable in usb_disable_lpm()
We check "u1_params" instead of checking "u2_params". Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Sarah Sharp <sarah.a.sharp@linux.intel.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/usb/core/hub.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
index 04fb834c3fa1..25a7422ee657 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. */