Commit:     f8fa7571a928d6d0e1b7444b0ea69ec7dc7db3b6
Parent:     dd95b814115e45e0bf800f2950b9941c86e68172
Author:     Alan Stern <[EMAIL PROTECTED]>
AuthorDate: Thu Jan 10 16:43:15 2008 -0500
Committer:  Greg Kroah-Hartman <[EMAIL PROTECTED]>
CommitDate: Fri Feb 1 14:35:03 2008 -0800

    USB: EHCI: move del_timer_sync calls outside spinlocked region
    This patch (as1030b) moves a del_timer_sync() call outside the scope of a
    spinlock, where it could cause a deadlock, and adds a new
    del_timer_sync() call for the new IAA watchdog timer (it was omitted
    by mistake).
    Signed-off-by: Alan Stern <[EMAIL PROTECTED]>
    Acked-by: David Brownell <[EMAIL PROTECTED]>
    Signed-off-by: Greg Kroah-Hartman <[EMAIL PROTECTED]>
 drivers/usb/host/ehci-hub.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/drivers/usb/host/ehci-hub.c b/drivers/usb/host/ehci-hub.c
index a249d03..7919a41 100644
--- a/drivers/usb/host/ehci-hub.c
+++ b/drivers/usb/host/ehci-hub.c
@@ -123,6 +123,8 @@ static int ehci_bus_suspend (struct usb_hcd *hcd)
        if (time_before (jiffies, ehci->next_statechange))
+       del_timer_sync(&ehci->watchdog);
+       del_timer_sync(&ehci->iaa_watchdog);
        port = HCS_N_PORTS (ehci->hcs_params);
        spin_lock_irq (&ehci->lock);
@@ -171,7 +173,6 @@ static int ehci_bus_suspend (struct usb_hcd *hcd)
        /* turn off now-idle HC */
-       del_timer_sync (&ehci->watchdog);
        ehci_halt (ehci);
        hcd->state = HC_STATE_SUSPENDED;
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to