USB: xhci: Clean up xhci_irq() function.
authorSarah Sharp <sarah.a.sharp@linux.intel.com>
Thu, 30 Apr 2009 02:05:40 +0000 (19:05 -0700)
committerGreg Kroah-Hartman <gregkh@suse.de>
Tue, 16 Jun 2009 04:44:50 +0000 (21:44 -0700)
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>
drivers/usb/host/xhci-hcd.c

index 94447bc..57aed12 100644 (file)
@@ -276,11 +276,11 @@ irqreturn_t xhci_irq(struct usb_hcd *hcd)
                return IRQ_NONE;
        }
 
-       temp = xhci_readl(xhci, &xhci->op_regs->status);
        if (temp & STS_FATAL) {
                xhci_warn(xhci, "WARNING: Host System Error\n");
                xhci_halt(xhci);
                xhci_to_hcd(xhci)->state = HC_STATE_HALT;
+               spin_unlock(&xhci->lock);
                return -ESHUTDOWN;
        }