---

yaml --- r: 164998 b: refs/heads/master c: 015798b h: refs/heads/master v: v3
git-mirror · Sep 23, 2009 · 40cbaab · 40cbaab
1 parent 668fcf2
commit 40cbaab
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0ffd3b2902e28b13d8379df0f09a55668f330f77
+refs/heads/master: 015798b2f166725b1dae2b07b5ffb127ab187be0
diff --git a/trunk/drivers/usb/host/ehci-hub.c b/trunk/drivers/usb/host/ehci-hub.c
@@ -209,6 +209,11 @@ static int ehci_bus_suspend (struct usb_hcd *hcd)
 
 	ehci->next_statechange = jiffies + msecs_to_jiffies(10);
 	spin_unlock_irq (&ehci->lock);
+
+	/* ehci_work() may have re-enabled the watchdog timer, which we do not
+	 * want, and so we must delete any pending watchdog timer events.
+	 */
+	del_timer_sync(&ehci->watchdog);
 	return 0;
 }