FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2024-12-22 09:22:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

usb: wusbcore: skip done segs before completing aborted transfer

Browse Source 
When completing an aborted transfer, skip done segs before calling
wa_complete_remaining_xfer_segs to avoid a runtime warning.  The warning
is harmless in this case but avoiding it prevents false error reports.

Signed-off-by: Thomas Pugliese <thomas.pugliese@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Thomas Pugliese 2014-09-16 16:36:02 -05:00 committed by Greg Kroah-Hartman
parent f55025289c
commit b94be0db5b
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/usb/wusbcore/wa-xfer.c
View File

@ -459,14 +459,25 @@ static void __wa_xfer_abort_cb(struct urb *urb)
__func__, urb->status); __func__, urb->status);
if (xfer) { if (xfer) {
unsigned long flags; unsigned long flags;
int done; int done, seg_index = 0;
struct wa_rpipe *rpipe = xfer->ep->hcpriv; struct wa_rpipe *rpipe = xfer->ep->hcpriv;
dev_err(dev, "%s: cleaning up xfer %p ID 0x%08X.\n", dev_err(dev, "%s: cleaning up xfer %p ID 0x%08X.\n",
__func__, xfer, wa_xfer_id(xfer)); __func__, xfer, wa_xfer_id(xfer));
spin_lock_irqsave(&xfer->lock, flags); spin_lock_irqsave(&xfer->lock, flags);
/* mark all segs as aborted. */ /* skip done segs. */
wa_complete_remaining_xfer_segs(xfer, 0, while (seg_index < xfer->segs) {
struct wa_seg *seg = xfer->seg[seg_index];
if ((seg->status == WA_SEG_DONE) ||
(seg->status == WA_SEG_ERROR)) {
++seg_index;
} else {
break;
}
}
/* mark remaining segs as aborted. */
wa_complete_remaining_xfer_segs(xfer, seg_index,
WA_SEG_ABORTED); WA_SEG_ABORTED);
done = __wa_xfer_is_done(xfer); done = __wa_xfer_is_done(xfer);
spin_unlock_irqrestore(&xfer->lock, flags); spin_unlock_irqrestore(&xfer->lock, flags);