1 files changed, 6 insertions, 1 deletions

diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c
index f5397a517c54..7d34cbfaf373 100644
--- a/drivers/usb/host/xhci-ring.c
+++ b/drivers/usb/host/xhci-ring.c
@@ -2026,8 +2026,13 @@ static int process_isoc_td(struct xhci_hcd *xhci, struct xhci_td *td,
                 break;
         case COMP_DEV_ERR:
         case COMP_STALL:
+                frame->status = -EPROTO;
+                skip_td = true;
+                break;
         case COMP_TX_ERR:
                 frame->status = -EPROTO;
+                if (event_trb != td->last_trb)
+                        return 0;
                 skip_td = true;
                 break;
         case COMP_STOP:
@@ -2640,7 +2645,7 @@ irqreturn_t xhci_irq(struct usb_hcd *hcd)
                 xhci_halt(xhci);
 hw_died:
                 spin_unlock(&xhci->lock);
-                return -ESHUTDOWN;
+                return IRQ_HANDLED;
         }
 
         /*