summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthieu CASTET <castet.matthieu@free.fr>2011-11-28 11:30:22 +0100
committerGreg Kroah-Hartman <gregkh@suse.de>2011-11-29 09:59:29 +0900
commite3420901eba65b1c46bed86d360e3a8685d20734 (patch)
tree747ae7ec657793fba9b5523cd573f6bd25f7905b
parentdf711fc9962b9491af2b92bd0d21ecbfefe4e5fa (diff)
downloadblackbird-op-linux-e3420901eba65b1c46bed86d360e3a8685d20734.tar.gz
blackbird-op-linux-e3420901eba65b1c46bed86d360e3a8685d20734.zip
EHCI : Fix a regression in the ISO scheduler
Fix a regression that was introduced by commit 811c926c538f7e8d3c08b630dd5844efd7e000f6 (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: Sander Eikelenboom <linux@eikelenboom.it> Signed-off-by: Matthieu CASTET <castet.matthieu@free.fr> Acked-by: Alan Stern <stern@rowland.harvard.edu> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/usb/host/ehci-sched.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/usb/host/ehci-sched.c b/drivers/usb/host/ehci-sched.c
index 56a32033adb3..a60679cbbf85 100644
--- a/drivers/usb/host/ehci-sched.c
+++ b/drivers/usb/host/ehci-sched.c
@@ -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;
OpenPOWER on IntegriCloud