diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-09-29 18:29:23 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-09-29 18:29:23 -0700 |
| commit | 88502b9c0a5dcc884c0dbfb6ddf964ff5da5d8d3 (patch) | |
| tree | f79f728c308100bc3e57d0d2f5d1e00d90406a0d /drivers/usb/host/uhci-q.c | |
| parent | e18945b159a1cdbc031f1d3b0b7e515a33bdcbf7 (diff) | |
| parent | 15c03dd4859ab16f9212238f29dd315654aa94f6 (diff) | |
| download | blackbird-op-linux-88502b9c0a5dcc884c0dbfb6ddf964ff5da5d8d3.tar.gz blackbird-op-linux-88502b9c0a5dcc884c0dbfb6ddf964ff5da5d8d3.zip | |
Merge 3.12-rc3 into driver-core-next
We want the driver core and sysfs fixes in here to make merges and
development easier.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/host/uhci-q.c')
| -rw-r--r-- | drivers/usb/host/uhci-q.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/drivers/usb/host/uhci-q.c b/drivers/usb/host/uhci-q.c index 041c6ddb695c..da6f56d996ce 100644 --- a/drivers/usb/host/uhci-q.c +++ b/drivers/usb/host/uhci-q.c @@ -1303,7 +1303,7 @@ static int uhci_submit_isochronous(struct uhci_hcd *uhci, struct urb *urb, } /* Fell behind? */ - if (uhci_frame_before_eq(frame, next)) { + if (!uhci_frame_before_eq(next, frame)) { /* USB_ISO_ASAP: Round up to the first available slot */ if (urb->transfer_flags & URB_ISO_ASAP) @@ -1311,13 +1311,17 @@ static int uhci_submit_isochronous(struct uhci_hcd *uhci, struct urb *urb, -qh->period; /* - * Not ASAP: Use the next slot in the stream. If - * the entire URB falls before the threshold, fail. + * Not ASAP: Use the next slot in the stream, + * no matter what. */ else if (!uhci_frame_before_eq(next, frame + (urb->number_of_packets - 1) * qh->period)) - return -EXDEV; + dev_dbg(uhci_dev(uhci), "iso underrun %p (%u+%u < %u)\n", + urb, frame, + (urb->number_of_packets - 1) * + qh->period, + next); } } |
