Commit 7d14c9d1 authored by Alan Stern's avatar Alan Stern Committed by Sasha Levin

USB: EHCI: fix initialization bug in iso_stream_schedule()

Commit c3ee9b76 (EHCI: improved logic for isochronous scheduling)
introduced the idea of using ehci->last_iso_frame as the origin (or
base) for the circular calculations involved in modifying the
isochronous schedule.  However, the new code it added used
ehci->last_iso_frame before the value was properly initialized.  This
patch rectifies the mistake by moving the initialization lines earlier
in iso_stream_schedule().

This fixes Bugzilla #72891.
Signed-off-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Fixes: c3ee9b76Reported-by: default avatarJoe Bryant <tenminjoe@yahoo.com>
Tested-by: default avatarJoe Bryant <tenminjoe@yahoo.com>
Tested-by: default avatarMartin Long <martin@longhome.co.uk>
CC: <stable@vger.kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>

(cherry picked from commit 6d89252a)
Signed-off-by: default avatarSasha Levin <sasha.levin@oracle.com>
parent 8b3e40c4
......@@ -1362,6 +1362,10 @@ iso_stream_schedule (
now = ehci_read_frame_index(ehci) & (mod - 1);
/* If needed, initialize last_iso_frame so that this URB will be seen */
if (ehci->isoc_count == 0)
ehci->last_iso_frame = now >> 3;
/* Typical case: reuse current schedule, stream is still active.
* Hopefully there are no gaps from the host falling behind
* (irq delays etc). If there are, the behavior depends on
......@@ -1471,10 +1475,6 @@ iso_stream_schedule (
urb->start_frame = stream->next_uframe;
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 0;
fail:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment