Linux 3.1.4

Linux 3.1.4

[Greg KH]

[-- Attachment #1: Type: text/plain, Size: 806 bytes --]

I'm announcing the release of the 3.1.4 kernel.

It reverts a USB patch that was broken in the 3.1.3 release.  If you
don't have USB isochronous devices (i.e. webcam, audio, or other
streaming devices), you don't need to upgrade.

The updated 3.1.y git tree can be found at:
        git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-3.1.y
and can be browsed at the normal kernel.org git web browser:
        http://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary

thanks,

greg k-h

------------

 Makefile                      |    2 +-
 drivers/usb/host/ehci-sched.c |   15 +++++----------
 2 files changed, 6 insertions(+), 11 deletions(-)

Greg Kroah-Hartman (2):
      Revert "USB: EHCI: fix HUB TT scheduling issue with iso transfer"
      Linux 3.1.4


[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

Re: Linux 3.1.4

[Greg KH]

diff --git a/Makefile b/Makefile
index d614254..7f8a93b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 VERSION = 3
 PATCHLEVEL = 1
-SUBLEVEL = 3
+SUBLEVEL = 4
 EXTRAVERSION =
 NAME = "Divemaster Edition"
 
diff --git a/drivers/usb/host/ehci-sched.c b/drivers/usb/host/ehci-sched.c
index afef3df..29bec34 100644
--- a/drivers/usb/host/ehci-sched.c
+++ b/drivers/usb/host/ehci-sched.c
@@ -1480,15 +1480,10 @@ iso_stream_schedule (
 
 		/* NOTE:  assumes URB_ISO_ASAP, to limit complexity/bugs */
 
-		/* find a uframe slot with enough bandwidth.
-		 * Early uframes are more precious because full-speed
-		 * iso IN transfers can't use late uframes,
-		 * and therefore they should be allocated last.
-		 */
-		next = start;
-		start += period;
-		do {
-			start--;
+		/* find a uframe slot with enough bandwidth */
+		next = start + period;
+		for (; start < next; start++) {
+
 			/* check schedule: enough space? */
 			if (stream->highspeed) {
 				if (itd_slot_ok(ehci, mod, start,
@@ -1501,7 +1496,7 @@ iso_stream_schedule (
 						start, sched, period))
 					break;
 			}
-		} while (start > next);
+		}
 
 		/* no room in the schedule */
 		if (start == next) {