summaryrefslogtreecommitdiffstats
path: root/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.9/0040-xhci-Fix-oops-caused-by-more-USB2-ports-than-USB3-po.patch
diff options
context:
space:
mode:
authorKoen Kooi <koen@dominion.thruhere.net>2012-03-01 09:35:40 +0100
committerDenys Dmytriyenko <denys@ti.com>2012-03-04 23:35:53 -0500
commit4d6e7c358e61f2053f945423718d0923b6413f99 (patch)
treed2c7ac4906cb51ff7183ab48b497675584c72cfc /recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.9/0040-xhci-Fix-oops-caused-by-more-USB2-ports-than-USB3-po.patch
parente31722adc42ef202ae273571ce19a7ac304e5eb6 (diff)
downloadmeta-ti-4d6e7c358e61f2053f945423718d0923b6413f99.tar.gz
linux-ti33x-psp 3.2: update to 3.2.9 and add 2 patches from PSP tree
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> Signed-off-by: Denys Dmytriyenko <denys@ti.com>
Diffstat (limited to 'recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.9/0040-xhci-Fix-oops-caused-by-more-USB2-ports-than-USB3-po.patch')
-rw-r--r--recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.9/0040-xhci-Fix-oops-caused-by-more-USB2-ports-than-USB3-po.patch39
1 files changed, 39 insertions, 0 deletions
diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.9/0040-xhci-Fix-oops-caused-by-more-USB2-ports-than-USB3-po.patch b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.9/0040-xhci-Fix-oops-caused-by-more-USB2-ports-than-USB3-po.patch
new file mode 100644
index 00000000..a6470edc
--- /dev/null
+++ b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.9/0040-xhci-Fix-oops-caused-by-more-USB2-ports-than-USB3-po.patch
@@ -0,0 +1,39 @@
1From 60e1345a34208c8024e01dc7481e090737720d90 Mon Sep 17 00:00:00 2001
2From: Sarah Sharp <sarah.a.sharp@linux.intel.com>
3Date: Thu, 9 Feb 2012 14:43:44 -0800
4Subject: [PATCH 40/73] xhci: Fix oops caused by more USB2 ports than USB3
5 ports.
6
7commit 3278a55a1aebe2bbd47fbb5196209e5326a88b56 upstream.
8
9The code to set the device removable bits in the USB 2.0 roothub
10descriptor was accidentally looking at the USB 3.0 port registers
11instead of the USB 2.0 registers. This can cause an oops if there are
12more USB 2.0 registers than USB 3.0 registers.
13
14This should be backported to kernels as old as 2.6.39, that contain the
15commit 4bbb0ace9a3de8392527e3c87926309d541d3b00 "xhci: Return a USB 3.0
16hub descriptor for USB3 roothub."
17
18Signed-off-by: Sarah Sharp <sarah.a.sharp@linux.intel.com>
19Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
20---
21 drivers/usb/host/xhci-hub.c | 2 +-
22 1 files changed, 1 insertions(+), 1 deletions(-)
23
24diff --git a/drivers/usb/host/xhci-hub.c b/drivers/usb/host/xhci-hub.c
25index 430e88f..a8b2980 100644
26--- a/drivers/usb/host/xhci-hub.c
27+++ b/drivers/usb/host/xhci-hub.c
28@@ -95,7 +95,7 @@ static void xhci_usb2_hub_descriptor(struct usb_hcd *hcd, struct xhci_hcd *xhci,
29 */
30 memset(port_removable, 0, sizeof(port_removable));
31 for (i = 0; i < ports; i++) {
32- portsc = xhci_readl(xhci, xhci->usb3_ports[i]);
33+ portsc = xhci_readl(xhci, xhci->usb2_ports[i]);
34 /* If a device is removable, PORTSC reports a 0, same as in the
35 * hub descriptor DeviceRemovable bits.
36 */
37--
381.7.7.4
39