diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2011-11-29 07:40:10 +0900 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-11-29 07:40:10 +0900 |
| commit | 4a8dec4b97aaf62dd1d532fd1b2edbc26afd4cb9 (patch) | |
| tree | 28d6997b3e522cccd3c3126b523898a80adffb32 | |
| parent | e6c2efafa8854e544bd15bdfc8498d4d0507d805 (diff) | |
| download | linux-stable-4a8dec4b97aaf62dd1d532fd1b2edbc26afd4cb9.tar.gz linux-stable-4a8dec4b97aaf62dd1d532fd1b2edbc26afd4cb9.tar.bz2 linux-stable-4a8dec4b97aaf62dd1d532fd1b2edbc26afd4cb9.zip | |
Revert "USB: EHCI: fix HUB TT scheduling issue with iso transfer"
This reverts commit f0cc710a6dec5b808a6f13f1f8853c094fce5f12.
Cc: Matthieu Castet <matthieu.castet@parrot.com>
Cc: Thomas Poussevin <thomas.poussevin@parrot.com>
Cc: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | drivers/usb/host/ehci-sched.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/drivers/usb/host/ehci-sched.c b/drivers/usb/host/ehci-sched.c index afef3df9757d..29bec34973b9 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) { |