tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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>
+3
-9
+1
-1
drivers/usb/host/xhci-hub.c
+1
-1
drivers/usb/host/xhci-hub.c
···
93
93
*/
94
94
memset(port_removable, 0, sizeof(port_removable));
95
95
for (i = 0; i < ports; i++) {
96
-
portsc = xhci_readl(xhci, xhci->usb3_ports[i]);
96
+
portsc = xhci_readl(xhci, xhci->usb2_ports[i]);
97
97
/* If a device is removable, PORTSC reports a 0, same as in the
98
98
* hub descriptor DeviceRemovable bits.
99
99
*/
+2
-8
include/linux/usb/ch11.h
+2
-8
include/linux/usb/ch11.h
···
61
61
#define USB_PORT_FEAT_TEST 21
62
62
#define USB_PORT_FEAT_INDICATOR 22
63
63
#define USB_PORT_FEAT_C_PORT_L1 23
64
-
#define USB_PORT_FEAT_C_PORT_LINK_STATE 25
65
-
#define USB_PORT_FEAT_C_PORT_CONFIG_ERROR 26
66
-
#define USB_PORT_FEAT_PORT_REMOTE_WAKE_MASK 27
67
-
#define USB_PORT_FEAT_BH_PORT_RESET 28
68
-
#define USB_PORT_FEAT_C_BH_PORT_RESET 29
69
-
#define USB_PORT_FEAT_FORCE_LINKPM_ACCEPT 30
70
64
71
65
/*
72
66
* Port feature selectors added by USB 3.0 spec.
···
69
75
#define USB_PORT_FEAT_LINK_STATE 5
70
76
#define USB_PORT_FEAT_U1_TIMEOUT 23
71
77
#define USB_PORT_FEAT_U2_TIMEOUT 24
72
-
#define USB_PORT_FEAT_C_LINK_STATE 25
73
-
#define USB_PORT_FEAT_C_CONFIG_ERR 26
78
+
#define USB_PORT_FEAT_C_PORT_LINK_STATE 25
79
+
#define USB_PORT_FEAT_C_PORT_CONFIG_ERROR 26
74
80
#define USB_PORT_FEAT_REMOTE_WAKE_MASK 27
75
81
#define USB_PORT_FEAT_BH_PORT_RESET 28
76
82
#define USB_PORT_FEAT_C_BH_PORT_RESET 29