diff options
author | Andiry Xu <andiry.xu@amd.com> | 2011-08-03 04:46:48 -0400 |
---|---|---|
committer | Herton Ronaldo Krzesinski <herton.krzesinski@canonical.com> | 2011-10-17 13:32:26 -0400 |
commit | b07a223a856f413fb0fdb366e69c7c569c33b19d (patch) | |
tree | 5562b847c59e0f89b4a83d02062dfedbbf3937fb /drivers/usb | |
parent | 5c2f434f636bb48781f735fc28148ce79f395e30 (diff) |
xHCI: fix port U3 status check condition
BugLink: http://bugs.launchpad.net/bugs/868628
commit 5ac04bf190e6f8b17238aef179ebd7f2bdfec919 upstream.
Fix the port U3 status check when Clear PORT_SUSPEND Feature.
The port status should be masked with PORT_PLS_MASK to check if it's in
U3 state.
This should be backported to kernels as old as 2.6.37.
Signed-off-by: Andiry Xu <andiry.xu@amd.com>
Signed-off-by: Sarah Sharp <sarah.a.sharp@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb')
-rw-r--r-- | drivers/usb/host/xhci-hub.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/host/xhci-hub.c b/drivers/usb/host/xhci-hub.c index 0be788cc2fd..cddcdccadbf 100644 --- a/drivers/usb/host/xhci-hub.c +++ b/drivers/usb/host/xhci-hub.c | |||
@@ -664,7 +664,7 @@ int xhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue, | |||
664 | xhci_dbg(xhci, "PORTSC %04x\n", temp); | 664 | xhci_dbg(xhci, "PORTSC %04x\n", temp); |
665 | if (temp & PORT_RESET) | 665 | if (temp & PORT_RESET) |
666 | goto error; | 666 | goto error; |
667 | if (temp & XDEV_U3) { | 667 | if ((temp & PORT_PLS_MASK) == XDEV_U3) { |
668 | if ((temp & PORT_PE) == 0) | 668 | if ((temp & PORT_PE) == 0) |
669 | goto error; | 669 | goto error; |
670 | 670 | ||