Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 174909
b: refs/heads/master
c: d7e055f
h: refs/heads/master
i:
  174907: 9770f43
v: v3
  • Loading branch information
Sarah Sharp authored and Greg Kroah-Hartman committed Dec 11, 2009
1 parent 9ec8510 commit 774142c
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 3c67d899cde32099bfc484f6ccc9b90c2e0c9fc8
refs/heads/master: d7e055f1975cac560427c924d2bff4b5d41fe442
8 changes: 4 additions & 4 deletions trunk/drivers/usb/host/ehci-sched.c
Original file line number Diff line number Diff line change
Expand Up @@ -1385,7 +1385,7 @@ sitd_slot_ok (
* given EHCI_TUNE_FLS and the slop). Or, write a smarter scheduler!
*/

#define SCHEDULE_SLOP 10 /* frames */
#define SCHEDULE_SLOP 80 /* microframes */

static int
iso_stream_schedule (
Expand All @@ -1399,7 +1399,7 @@ iso_stream_schedule (
unsigned mod = ehci->periodic_size << 3;
struct ehci_iso_sched *sched = urb->hcpriv;

if (sched->span > (mod - 8 * SCHEDULE_SLOP)) {
if (sched->span > (mod - SCHEDULE_SLOP)) {
ehci_dbg (ehci, "iso request %p too long\n", urb);
status = -EFBIG;
goto fail;
Expand Down Expand Up @@ -1432,7 +1432,7 @@ iso_stream_schedule (
start += mod;

/* Fell behind (by up to twice the slop amount)? */
if (start >= max - 2 * 8 * SCHEDULE_SLOP)
if (start >= max - 2 * SCHEDULE_SLOP)
start += period * DIV_ROUND_UP(
max - start, period) - mod;

Expand All @@ -1451,7 +1451,7 @@ iso_stream_schedule (
* can also help high bandwidth if the dma and irq loads don't
* jump until after the queue is primed.
*/
start = SCHEDULE_SLOP * 8 + (now & ~0x07);
start = SCHEDULE_SLOP + (now & ~0x07);
start %= mod;
stream->next_uframe = start;

Expand Down

0 comments on commit 774142c

Please sign in to comment.