From bff98234f65afa5b86be6f799504d855a953f4eb Mon Sep 17 00:00:00 2001 From: Sarah Sharp Date: Tue, 16 Nov 2010 15:58:52 -0800 Subject: [PATCH] --- yaml --- r: 222815 b: refs/heads/master c: 6dd0a3a7e0793dbeae1b951f091025d8cf896cb4 h: refs/heads/master i: 222813: f6161bc20ddfab3c8121d3e05b3b139d53121402 222811: 5db87070ebef906683c6ce3c2c325098b590060d 222807: ad270642fba85c4c7d32b08fa48aeaff60b11de4 222799: a2a42a762883a10de115d32368557b1a634efb66 222783: 8e9b032e58d02ffcb5834b9a336c8f696218da39 v: v3 --- [refs] | 2 +- trunk/drivers/usb/host/xhci-hub.c | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 6fe44b4b1021..55a49255301b 100644 --- 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 index fef5a1f9d483..5d963e350494 100644 --- 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);