diff options
| author | Mark Brown <broonie@kernel.org> | 2015-01-28 17:04:54 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-01-28 17:04:54 +0000 |
| commit | 588956edf5bb33741de41687677f21f5c37671da (patch) | |
| tree | 70508bb41cc7320b3b798cdda405f20deff59a39 /drivers/usb/host/ehci-sched.c | |
| parent | 750d40d7dfd65c0b8babb67137843db8a9a99140 (diff) | |
| parent | 9347e87f7cd66d6ca96ba7d0b4b1cacebea4d096 (diff) | |
Merge branch 'linux-linaro-lsk-v3.14' into linux-linaro-lsk-v3.14-rtlsk-v3.14-rt-15.02lsk-v3.14-rt-14.02
Diffstat (limited to 'drivers/usb/host/ehci-sched.c')
| -rw-r--r-- | drivers/usb/host/ehci-sched.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/usb/host/ehci-sched.c b/drivers/usb/host/ehci-sched.c index e113fd73aeae..c399606f154e 100644 --- a/drivers/usb/host/ehci-sched.c +++ b/drivers/usb/host/ehci-sched.c @@ -1581,6 +1581,10 @@ iso_stream_schedule ( else next = (now + 2 + 7) & ~0x07; /* full frame cache */ + /* If needed, initialize last_iso_frame so that this URB will be seen */ + if (ehci->isoc_count == 0) + ehci->last_iso_frame = now >> 3; + /* * Use ehci->last_iso_frame as the base. There can't be any * TDs scheduled for earlier than that. @@ -1671,10 +1675,6 @@ iso_stream_schedule ( urb->start_frame = start & (mod - 1); if (!stream->highspeed) urb->start_frame >>= 3; - - /* Make sure scan_isoc() sees these */ - if (ehci->isoc_count == 0) - ehci->last_iso_frame = now >> 3; return status; fail: |