summaryrefslogtreecommitdiff
path: root/drivers/usb/host/xhci-hub.c
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2012-02-27 03:50:11 +0400
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2012-02-27 03:50:11 +0400
commitf851013cb2238a82782da03ac82a14447933f90d (patch)
treef97835f69d244865c4a5397d0e6d45d1276a919d /drivers/usb/host/xhci-hub.c
parentf2699491e06584a2ebb0939f108ad29f3b151456 (diff)
parent203738e548cefc3fc3c2f73a9063176c9f3583d5 (diff)
downloadlinux-f851013cb2238a82782da03ac82a14447933f90d.tar.xz
Merge remote-tracking branch 'origin/master' into next
Diffstat (limited to 'drivers/usb/host/xhci-hub.c')
-rw-r--r--drivers/usb/host/xhci-hub.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/host/xhci-hub.c b/drivers/usb/host/xhci-hub.c
index 35e257f79c7b..557b6f32db86 100644
--- a/drivers/usb/host/xhci-hub.c
+++ b/drivers/usb/host/xhci-hub.c
@@ -93,7 +93,7 @@ static void xhci_usb2_hub_descriptor(struct usb_hcd *hcd, struct xhci_hcd *xhci,
*/
memset(port_removable, 0, sizeof(port_removable));
for (i = 0; i < ports; i++) {
- portsc = xhci_readl(xhci, xhci->usb3_ports[i]);
+ portsc = xhci_readl(xhci, xhci->usb2_ports[i]);
/* If a device is removable, PORTSC reports a 0, same as in the
* hub descriptor DeviceRemovable bits.
*/