diff options
author | Joe Lawrence <joe.lawrence@stratus.com> | 2015-04-30 17:16:04 +0300 |
---|---|---|
committer | Sasha Levin <sasha.levin@oracle.com> | 2015-06-10 13:42:17 -0400 |
commit | 59cf84998ed631bb0654decefcabd54487e7fa64 (patch) | |
tree | 28326a3cedf6279b2c7333075689f17e82bed215 /drivers/usb/host | |
parent | 635ab0086fb93a128f17f1415172a4714a8c67ad (diff) |
xhci: gracefully handle xhci_irq dead device
[ Upstream commit 948fa13504f80b9765d2b753691ab94c83a10341 ]
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>
Cc: <stable@vger.kernel.org>
Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
Diffstat (limited to 'drivers/usb/host')
-rw-r--r-- | drivers/usb/host/xhci-ring.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c index 27139b981a96..9848a67ddbbe 100644 --- a/drivers/usb/host/xhci-ring.c +++ b/drivers/usb/host/xhci-ring.c @@ -2656,7 +2656,7 @@ irqreturn_t xhci_irq(struct usb_hcd *hcd) xhci_halt(xhci); hw_died: spin_unlock(&xhci->lock); - return -ESHUTDOWN; + return IRQ_HANDLED; } /* |