From: Alan Stern Date: Thu, 10 Jan 2008 21:43:15 +0000 (-0500) Subject: USB: EHCI: move del_timer_sync calls outside spinlocked region X-Git-Tag: v2.6.25-rc1~1075^2~30 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=f8fa7571a928d6d0e1b7444b0ea69ec7dc7db3b6;p=linux-2.6-omap-h63xx.git 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 Acked-by: David Brownell Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/usb/host/ehci-hub.c b/drivers/usb/host/ehci-hub.c index a249d03a502..7919a411d5f 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)) msleep(5); + 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;