diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-02-14 03:10:01 +0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-02-14 03:10:12 +0400 |
| commit | 50e5dfb6c4111c860bfa4d93dfe115bedf6b0fb1 (patch) | |
| tree | 1785659e73faee5968c2f4fb1a1a18bb77c22ca3 /drivers/usb/host | |
| parent | 5ee71cf3bef66ad9683c681e48628fae057f8e18 (diff) | |
| parent | b7bc5925a9aafae970c3db1f118c97a7d503114e (diff) | |
| download | linux-50e5dfb6c4111c860bfa4d93dfe115bedf6b0fb1.tar.xz | |
Merge branch 'usb-linus' into usb-next
This is needed so that Sarah can queue up some xhci changes for 3.4
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/host')
| -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 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. */ |