UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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 <stern@rowland.harvard.edu>
Acked-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Alan Stern 2008-01-10 16:43:15 -05:00 committed by Greg Kroah-Hartman
parent dd95b81411
commit f8fa7571a9
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/usb/host/ehci-hub.c
View File

@ -123,6 +123,8 @@ static int ehci_bus_suspend (struct usb_hcd *hcd)
if (time_before (jiffies, ehci->next_statechange)) if (time_before (jiffies, ehci->next_statechange))
msleep(5); msleep(5);
del_timer_sync(&ehci->watchdog);
del_timer_sync(&ehci->iaa_watchdog);
port = HCS_N_PORTS (ehci->hcs_params); port = HCS_N_PORTS (ehci->hcs_params);
spin_lock_irq (&ehci->lock); spin_lock_irq (&ehci->lock);
@ -171,7 +173,6 @@ static int ehci_bus_suspend (struct usb_hcd *hcd)
} }
/* turn off now-idle HC */ /* turn off now-idle HC */
del_timer_sync (&ehci->watchdog);
ehci_halt (ehci); ehci_halt (ehci);
hcd->state = HC_STATE_SUSPENDED; hcd->state = HC_STATE_SUSPENDED;