path: root/drivers/usb/host/ehci-timer.c
diff options
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-03-20 16:21:47 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-03-20 16:21:47 -0700
commitcf2d9500a5a0df61713b56f2f40aa0b81a6f9f63 (patch)
tree945afa7596fcdc4d960812dee1812c187d282bff /drivers/usb/host/ehci-timer.c
parent3f3b55bf7833d81d00c793d722e2af58d3b12963 (diff)
parentd714aaf649460cbfd5e82e75520baa856b4fa0a0 (diff)
Merge branch 'usb-linus' into usb-next
This is to pick up the fixes in that branch, and let Alan fix the merge error in drivers/usb/host/ehci-timer.c better than I just did (as I know I messed it up...) Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/host/ehci-timer.c')
1 files changed, 0 insertions, 9 deletions
diff --git a/drivers/usb/host/ehci-timer.c b/drivers/usb/host/ehci-timer.c
index 97815d0fc97c..dca8fc42b8d7 100644
--- a/drivers/usb/host/ehci-timer.c
+++ b/drivers/usb/host/ehci-timer.c
@@ -297,15 +297,6 @@ 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->async_iaa || 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