diff options
| author | Steven Rostedt <srostedt@redhat.com> | 2011-11-30 18:51:58 -0500 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2011-11-30 18:51:58 -0500 |
| commit | d18a9b9a4a4b869351ff6d0a068cee70cf4a3f34 (patch) | |
| tree | 5e73af2aaea43fbafd098ab7868a74097cfbcbb5 | |
| parent | 535949d9dd5c7f9f3ec7800f7f925adfcd64a100 (diff) | |
| parent | ac6766564c0305ca020fe747dfd7dbdf0881369d (diff) | |
Merge commit 'v3.0.12' into v3.0-rt
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | drivers/usb/host/ehci-sched.c | 15 |
2 files changed, 6 insertions, 11 deletions
@@ -1,6 +1,6 @@ VERSION = 3 PATCHLEVEL = 0 -SUBLEVEL = 11 +SUBLEVEL = 12 EXTRAVERSION = NAME = Sneaky Weasel diff --git a/drivers/usb/host/ehci-sched.c b/drivers/usb/host/ehci-sched.c index fb2d0c2f0670..063c630d2467 100644 --- a/drivers/usb/host/ehci-sched.c +++ b/drivers/usb/host/ehci-sched.c @@ -1483,15 +1483,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, @@ -1504,7 +1499,7 @@ iso_stream_schedule ( start, sched, period)) break; } - } while (start > next); + } /* no room in the schedule */ if (start == next) { |