]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
xhci: gracefully handle xhci_irq dead device
authorJoe Lawrence <joe.lawrence@stratus.com>
Thu, 30 Apr 2015 14:16:04 +0000 (17:16 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 6 Jun 2015 15:20:59 +0000 (08:20 -0700)
commit 948fa13504f80b9765d2b753691ab94c83a10341 upstream.

If the xHCI host controller has died (ie, device removed) or suffered
other serious fatal error (STS_FATAL), then xhci_irq should handle this
condition with IRQ_HANDLED instead of -ESHUTDOWN.

Signed-off-by: Joe Lawrence <joe.lawrence@stratus.com>
Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/usb/host/xhci-ring.c

index 0f17b4c6927751ec099e167c11d11c973ed4de93..6994c99e58a681cb3e567de6dd4c6da4cc27e489 100644 (file)
@@ -2645,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;
        }
 
        /*