diff options
| author | Alexandre Courbot <acourbot@nvidia.com> | 2011-07-09 17:04:18 +0900 |
|---|---|---|
| committer | Niket Sirsi <nsirsi@nvidia.com> | 2011-07-12 15:11:56 -0700 |
| commit | 485d76d553deaa1b76edceba41f83bcdf38d33e7 (patch) | |
| tree | cbcc04fd06504b3e9a700c092a557d589bd8becb | |
| parent | 43a4d9901fd3823b63b3ca8ea1e64bbc217991cd (diff) | |
Revert "tegra: usb: prevent crash if irq occurs while sleeping"
This reverts commit d7b102eca117b41c0f244b292d076e574608c565.
Above change prevented USB3 hotplug to work at all.
Change-Id: I197dfb727d48ce8627574da4736e0407f2adcb90
Reviewed-on: http://git-master/r/40315
Reviewed-by: Niket Sirsi <nsirsi@nvidia.com>
Tested-by: Niket Sirsi <nsirsi@nvidia.com>
| -rw-r--r-- | drivers/usb/host/ehci-tegra.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/drivers/usb/host/ehci-tegra.c b/drivers/usb/host/ehci-tegra.c index 7e7fa871c66e..11d8ca6af9b8 100644 --- a/drivers/usb/host/ehci-tegra.c +++ b/drivers/usb/host/ehci-tegra.c @@ -86,7 +86,7 @@ static irqreturn_t tegra_ehci_irq (struct usb_hcd *hcd) u32 val; if (tegra->phy->usb_phy_type == TEGRA_USB_PHY_TYPE_UTMIP) { - spin_lock (&ehci->lock); + spin_lock(&ehci->lock); val = readl(hcd->regs + TEGRA_USB_SUSP_CTRL_OFFSET); if ((val & TEGRA_USB_PHY_CLK_VALID_INT_STS)) { val &= ~TEGRA_USB_PHY_CLK_VALID_INT_ENB | TEGRA_USB_PHY_CLK_VALID_INT_STS; @@ -98,15 +98,10 @@ static irqreturn_t tegra_ehci_irq (struct usb_hcd *hcd) val = readl(&hw->status); if (!(val & STS_PCD)) { - spin_unlock (&ehci->lock); + spin_unlock(&ehci->lock); return IRQ_NONE; } } - /* we would lock if we went further without power */ - if (!tegra->host_resumed) { - spin_unlock (&ehci->lock); - return IRQ_HANDLED; - } spin_unlock (&ehci->lock); } return ehci_irq(hcd); |