aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb
diff options
context:
space:
mode:
authorSarah Sharp <sarah.a.sharp@linux.intel.com>2009-04-29 22:05:40 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2009-06-16 00:44:50 -0400
commitc96a2b81f3747e6924307714666aa2368bc1718b (patch)
tree74e105ad1b7211b8764d361741520c548e7c6061 /drivers/usb
parent23e3be113f42790736319c049c78e5f9a4394c02 (diff)
USB: xhci: Clean up xhci_irq() function.
Drop spinlock in xhci_irq() error path. This fixes the issue reported by Oliver Neukum on this thread: http://marc.info/?l=linux-usb&m=124090924401444&w=2 Remove unnecessary register read reported by Viral Mehta: http://marc.info/?l=linux-usb&m=124091326007398&w=2 Reported-by: Oliver Neukum <oliver@neukum.org> Reported-by: Viral Mehta <viral.mehta@einfochips.com> Signed-off-by: Sarah Sharp <sarah.a.sharp@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb')
-rw-r--r--drivers/usb/host/xhci-hcd.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/host/xhci-hcd.c b/drivers/usb/host/xhci-hcd.c
index 94447bcdf19f..57aed12b63d2 100644
--- a/drivers/usb/host/xhci-hcd.c
+++ b/drivers/usb/host/xhci-hcd.c
@@ -276,11 +276,11 @@ irqreturn_t xhci_irq(struct usb_hcd *hcd)
276 return IRQ_NONE; 276 return IRQ_NONE;
277 } 277 }
278 278
279 temp = xhci_readl(xhci, &xhci->op_regs->status);
280 if (temp & STS_FATAL) { 279 if (temp & STS_FATAL) {
281 xhci_warn(xhci, "WARNING: Host System Error\n"); 280 xhci_warn(xhci, "WARNING: Host System Error\n");
282 xhci_halt(xhci); 281 xhci_halt(xhci);
283 xhci_to_hcd(xhci)->state = HC_STATE_HALT; 282 xhci_to_hcd(xhci)->state = HC_STATE_HALT;
283 spin_unlock(&xhci->lock);
284 return -ESHUTDOWN; 284 return -ESHUTDOWN;
285 } 285 }
286 286