From 220befa0a272e9983f00cc4f71db03ebc20ca37d Mon Sep 17 00:00:00 2001 From: Alan Stern Date: Wed, 20 Mar 2013 15:07:26 -0400 Subject: [PATCH] --- yaml --- r: 361628 b: refs/heads/master c: d714aaf649460cbfd5e82e75520baa856b4fa0a0 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/usb/host/ehci-timer.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index e650b988a417..e1b454164ae1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2726e202f7f54e69f95948f5015d39840c47e1b6 +refs/heads/master: d714aaf649460cbfd5e82e75520baa856b4fa0a0 diff --git a/trunk/drivers/usb/host/ehci-timer.c b/trunk/drivers/usb/host/ehci-timer.c index 20dbdcbe9b0f..c3fa1305f830 100644 --- a/trunk/drivers/usb/host/ehci-timer.c +++ b/trunk/drivers/usb/host/ehci-timer.c @@ -304,7 +304,7 @@ static void ehci_iaa_watchdog(struct ehci_hcd *ehci) * (a) SMP races against real IAA firing and retriggering, and * (b) clean HC shutdown, when IAA watchdog was pending. */ - if (ehci->async_iaa) { + if (1) { u32 cmd, status; /* If we get here, IAA is *REALLY* late. It's barely