aboutsummaryrefslogtreecommitdiff
path: root/drivers/usb/host/ehci-timer.c
diff options
context:
space:
mode:
authorAlan Stern <stern@rowland.harvard.edu>2013-03-21 12:48:42 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-03-21 15:00:18 -0700
commit417c765af914106f5e76c4e0181dd555fe6a89a0 (patch)
tree8234b26bc9dd1703124d49106b49e8fb0bfce3f7 /drivers/usb/host/ehci-timer.c
parent29727f3bc2e691d59c521ff09b4d59a743b5d9a3 (diff)
downloadlinux-stericsson-417c765af914106f5e76c4e0181dd555fe6a89a0.tar.gz
USB: EHCI: fix up incorrect merge resolution
This patch (as1671) fixes up an incorrect resolution of a merge conflict between Greg KH's usb-linus branch and his usb-next branch. Signed-off-by: Alan Stern <stern@rowland.harvard.edu> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/host/ehci-timer.c')
-rw-r--r--drivers/usb/host/ehci-timer.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/usb/host/ehci-timer.c b/drivers/usb/host/ehci-timer.c
index dca8fc42b8d7..e7363332887e 100644
--- a/drivers/usb/host/ehci-timer.c
+++ b/drivers/usb/host/ehci-timer.c
@@ -297,6 +297,15 @@ static void ehci_iaa_watchdog(struct ehci_hcd *ehci)
{
u32 cmd, status;
+ /*
+ * Lost IAA irqs wedge things badly; seen first with a vt8235.
+ * So we need this watchdog, but must protect it against both
+ * (a) SMP races against real IAA firing and retriggering, and
+ * (b) clean HC shutdown, when IAA watchdog was pending.
+ */
+ if (ehci->rh_state != EHCI_RH_RUNNING)
+ return;
+
/* If we get here, IAA is *REALLY* late. It's barely
* conceivable that the system is so busy that CMD_IAAD
* is still legitimately set, so let's be sure it's