Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e3420901 authored by Matthieu CASTET's avatar Matthieu CASTET Committed by Greg Kroah-Hartman
Browse files

EHCI : Fix a regression in the ISO scheduler 



Fix a regression that was introduced by commit
811c926c (USB: EHCI: fix HUB TT scheduling
issue with iso transfer).

We detect an error if next == start, but this means uframe 0 can't be allocated
anymore for iso transfer...

Reported-by: default avatarSander Eikelenboom <linux@eikelenboom.it>
Signed-off-by: default avatarMatthieu CASTET <castet.matthieu@free.fr>
Acked-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent df711fc9

drivers/usb/host/ehci-sched.c

+5 −4
Original line number Diff line number Diff line
@@ -1475,6 +1475,7 @@ iso_stream_schedule ( 
	 * jump until after the queue is primed.

	 */

	else {

		int done = 0;

		start = SCHEDULE_SLOP + (now & ~0x07);



		/* NOTE:  assumes URB_ISO_ASAP, to limit complexity/bugs */
@@ -1492,18 +1493,18 @@ iso_stream_schedule ( 
			if (stream->highspeed) {

				if (itd_slot_ok(ehci, mod, start,

						stream->usecs, period))

					break;

					done = 1;

			} else {

				if ((start % 8) >= 6)

					continue;

				if (sitd_slot_ok(ehci, mod, stream,

						start, sched, period))

					break;

					done = 1;

			}

		} while (start > next);

		} while (start > next && !done);



		/* no room in the schedule */

		if (start == next) {

		if (!done) {

			ehci_dbg(ehci, "iso resched full %p (now %d max %d)\n",

				urb, now, now + mod);

			status = -ENOSPC;