On Thursday 10 January 2008, Alan Stern wrote: > 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]> > --- > > This revised version puts the del_timer_sync calls after the potential > msleep. > > > Index: usb-2.6/drivers/usb/host/ehci-hub.c > =================================================================== > --- usb-2.6.orig/drivers/usb/host/ehci-hub.c > +++ usb-2.6/drivers/usb/host/ehci-hub.c > @@ -123,6 +123,8 @@ static int ehci_bus_suspend (struct usb_ > > 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_ > } > > /* 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 linux-usb" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
