---

yaml --- r: 222815 b: refs/heads/master c: 6dd0a3a h: refs/heads/master i: 222813: f6161bc 222811: 5db8707 222807: ad27064 222799: a2a42a7 222783: 8e9b032 v: v3
git-mirror · Nov 20, 2010 · bff9823 · bff9823
1 parent 7aadfd8
commit bff9823
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: da6699ce4a889c3795624ccdcfe7181cc89f18e8
+refs/heads/master: 6dd0a3a7e0793dbeae1b951f091025d8cf896cb4
diff --git a/trunk/drivers/usb/host/xhci-hub.c b/trunk/drivers/usb/host/xhci-hub.c
@@ -229,6 +229,13 @@ void xhci_ring_device(struct xhci_hcd *xhci, int slot_id)
 static void xhci_disable_port(struct xhci_hcd *xhci, u16 wIndex,
 		u32 __iomem *addr, u32 port_status)
 {
+	/* Don't allow the USB core to disable SuperSpeed ports. */
+	if (xhci->port_array[wIndex] == 0x03) {
+		xhci_dbg(xhci, "Ignoring request to disable "
+				"SuperSpeed port.\n");
+		return;
+	}
+
 	/* Write 1 to disable the port */
 	xhci_writel(xhci, port_status | PORT_PE, addr);
 	port_status = xhci_readl(xhci, addr);