Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-01 09:41:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

xHCI bug fixes for 3.3.

Browse Source 
Hi Greg,
 
 Here's two xHCI bug fixes that should be applied to 3.3.  Both are
 marked for stable.
 
 Once these are in, can you merge your usb-linus branch into your
 usb-next branch?  The USB 3.0 hub suspend patchset that I need to queue
 for 3.4 relies on the first patch.
 
 Sarah Sharp
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.11 (GNU/Linux)
 
 iQIcBAABAgAGBQJPNaAZAAoJEBMGWMLi1Gc58lsP/0ao7BYSZvCDdSXTCp/08h7n
 3WDu5YrVBxuU3EmzWvOKsO2yaYtpQN9vpK63mAa6HtDtDwUfzqP+M/aLHe778BdL
 7QYFRi7ZxpPBM5IoQFVGVWKOroSkeXVBr7JrvjqVCxeVya+pATxdjhURvF6FKEWz
 zxxQGZ9Xjfc3RPFWwC6AG8rGv76MzThTAl7wNdYi42h2dzGFwJNlHvGO2YY4Sw5f
 LBQTRthlMxXx2V/JJtZoyDd/YS3JVNBybm4/Y6i/HvrVj4Oz/I1bcpanAgCC67O3
 6fQ/ehOmI5nFGemSp/bnyWn9TG6E4/52ta7m+dMrEpfum9xHfwoozNjEApVZfLgQ
 GwBOZFUWDZ0XpSNKPOWSlegtaT09Jnqle5i952VHLvCvzZjJfRMDE7kJMnKnaF3Y
 MzXO6Ejls+kgByzKvdlFeNbOdaW5L5ypkwkf8iYC7FzuGhIE1yrG5OfB0o9gxuR8
 WGlWK91jgxdNKWJH1/rALgGzgm9QjihfSfwSrQrC4BqpuvJlK9fXcIrsEOSA0RWH
 5+OgnPWmTTA6iKxliKS9I8qAPhEzAhxLR8jrNpL3V8J9/sym8S4LeR9lHBdreXvM
 5nvcDdyjZE5NErc/7cIA85/N0bYtbOiiGrbiK7uT5aJUTVFwbCyicMj35a2/G3g9
 wJi6k7Ti5hD5BZy7i0Rd
 =FJMw
 -----END PGP SIGNATURE-----

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.
This commit is contained in:
Greg Kroah-Hartman 2012-02-13 14:44:09 -08:00
commit b7bc5925a9
2 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/usb/host/xhci-hub.c
View File

@ -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.
*/

10
include/linux/usb/ch11.h
View File

@ -61,12 +61,6 @@
#define USB_PORT_FEAT_TEST 21
#define USB_PORT_FEAT_INDICATOR 22
#define USB_PORT_FEAT_C_PORT_L1 23
#define USB_PORT_FEAT_C_PORT_LINK_STATE 25
#define USB_PORT_FEAT_C_PORT_CONFIG_ERROR 26
#define USB_PORT_FEAT_PORT_REMOTE_WAKE_MASK 27
#define USB_PORT_FEAT_BH_PORT_RESET 28
#define USB_PORT_FEAT_C_BH_PORT_RESET 29
#define USB_PORT_FEAT_FORCE_LINKPM_ACCEPT 30
/*
* Port feature selectors added by USB 3.0 spec.
@ -75,8 +69,8 @@
#define USB_PORT_FEAT_LINK_STATE 5
#define USB_PORT_FEAT_U1_TIMEOUT 23
#define USB_PORT_FEAT_U2_TIMEOUT 24
#define USB_PORT_FEAT_C_LINK_STATE 25
#define USB_PORT_FEAT_C_CONFIG_ERR 26
#define USB_PORT_FEAT_C_PORT_LINK_STATE 25
#define USB_PORT_FEAT_C_PORT_CONFIG_ERROR 26
#define USB_PORT_FEAT_REMOTE_WAKE_MASK 27
#define USB_PORT_FEAT_BH_PORT_RESET 28
#define USB_PORT_FEAT_C_BH_PORT_RESET 29