diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-02-13 14:44:09 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-02-13 14:44:40 -0800 |
| commit | b7bc5925a9aafae970c3db1f118c97a7d503114e (patch) | |
| tree | 90673c5b5c9d234ad09b190565355c154f5402cc /drivers/usb/host | |
| parent | fe250923bbbbcbccc9aa7b84d05ee7a060450534 (diff) | |
| parent | 3278a55a1aebe2bbd47fbb5196209e5326a88b56 (diff) | |
Merge tag 'for-usb-linus-2012-02-10' of git://git.kernel.org/pub/scm/linux/kernel/git/sarah/xhci into usb-linus
xHCI bug fixes for 3.3.
Here's two xHCI bug fixes that should be applied to 3.3. Both are
marked for stable.
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 35e257f79c7..557b6f32db8 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. */ |