[kernel] r16935 - in dists/squeeze/linux-2.6/debian: . patches/bugfix/all patches/series

[Ben Hutchings]

Author: benh
Date: Fri Feb 25 03:34:23 2011
New Revision: 16935

Log:
Revert a fix from 2.6.32.29 that's reported to cause a regression

References:
http://linux.kernel.org/pipermail/stable-review/2011-February/008336.html
http://linux.kernel.org/pipermail/stable-review/2011-February/008348.html

Added:
   dists/squeeze/linux-2.6/debian/patches/bugfix/all/revert-USB-prevent-buggy-hubs-from-crashing-the-USB.patch
Modified:
   dists/squeeze/linux-2.6/debian/changelog
   dists/squeeze/linux-2.6/debian/patches/series/31

Modified: dists/squeeze/linux-2.6/debian/changelog
==============================================================================
--- dists/squeeze/linux-2.6/debian/changelog	Tue Feb 22 13:38:14 2011	(r16934)
+++ dists/squeeze/linux-2.6/debian/changelog	Fri Feb 25 03:34:23 2011	(r16935)
@@ -17,7 +17,6 @@
   * aufs: Fix VM race leading to kernel panic (Closes: #607879)
   * rt2500usb: Fall back to SW encryption for TKIP+AES (Closes: #611390)
   * Add longterm 2.6.32.29:
-    - USB: Prevent buggy hubs from crashing the USB stack
     - SCSI: Fix medium error problems with some arrays which can cause
       data corruption
     - ptrace: Use safer wake up on ptrace_detach()
@@ -27,6 +26,8 @@
     - sched: Use group weight, idle cpu metrics to fix imbalances during
       idle
     - [openvz,vserver] Revert sched changes since they conflict
+  * Revert "USB: Prevent buggy hubs from crashing the USB stack", included
+    in longterm 2.6.32.29 and reported to cause a regression
   * virtio_net: Further fixes for out-of-memory conditions (Closes: #603835)
     - Fix OOM handling on TX
     - Add schedule check to napi_enable call

Added: dists/squeeze/linux-2.6/debian/patches/bugfix/all/revert-USB-prevent-buggy-hubs-from-crashing-the-USB.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/squeeze/linux-2.6/debian/patches/bugfix/all/revert-USB-prevent-buggy-hubs-from-crashing-the-USB.patch	Fri Feb 25 03:34:23 2011	(r16935)
@@ -0,0 +1,33 @@
+From: Ben Hutchings <ben at decadent.org.uk>
+Date: Fri, 25 Feb 2011 03:23:23 +0000
+Subject: [PATCH] Revert "USB: prevent buggy hubs from crashing the USB stack"
+
+This reverts commit 0df14562c291a90c9e74f80b5ee671df474de6cb (commit
+d199c96d41d80a567493e12b8e96ea056a1350c1 upstream), included in
+longterm 2.6.32.29, which was reported to cause a regression:
+
+http://linux.kernel.org/pipermail/stable-review/2011-February/008336.html
+http://linux.kernel.org/pipermail/stable-review/2011-February/008348.html
+---
+ drivers/usb/core/hub.c |    5 -----
+ 1 files changed, 0 insertions(+), 5 deletions(-)
+
+diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
+index 283f019..86768cd 100644
+--- a/drivers/usb/core/hub.c
++++ b/drivers/usb/core/hub.c
+@@ -2711,11 +2711,6 @@ hub_port_init (struct usb_hub *hub, struct usb_device *udev, int port1,
+ 		udev->ttport = hdev->ttport;
+ 	} else if (udev->speed != USB_SPEED_HIGH
+ 			&& hdev->speed == USB_SPEED_HIGH) {
+-		if (!hub->tt.hub) {
+-			dev_err(&udev->dev, "parent hub has no TT\n");
+-			retval = -EINVAL;
+-			goto fail;
+-		}
+ 		udev->tt = &hub->tt;
+ 		udev->ttport = port1;
+ 	}
+-- 
+1.7.4.1
+

Modified: dists/squeeze/linux-2.6/debian/patches/series/31
==============================================================================
--- dists/squeeze/linux-2.6/debian/patches/series/31	Tue Feb 22 13:38:14 2011	(r16934)
+++ dists/squeeze/linux-2.6/debian/patches/series/31	Fri Feb 25 03:34:23 2011	(r16935)
@@ -35,3 +35,4 @@
 + debian/revert-radio-aimslab-gcc4.5-fix-in-2.6.32.29.patch
 + bugfix/s390/remove-task_show_regs.patch
 + bugfix/all/can-use-inode-instead-of-kernel-address-for-proc-file.patch
++ bugfix/all/revert-USB-prevent-buggy-hubs-from-crashing-the-USB.patch