Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 50e5dfb6 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

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: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parents 5ee71cf3 b7bc5925

drivers/usb/host/xhci-hub.c

+1 −1
Original line number Diff line number Diff line
@@ -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.

		 */

include/linux/usb/ch11.h

+2 −8
Original line number Diff line number Diff line
@@ -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