Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f8fa7571 authored by Alan Stern's avatar Alan Stern Committed by Greg Kroah-Hartman
Browse files

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: default avatarAlan Stern <stern@rowland.harvard.edu>
Acked-by: default avatarDavid Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent dd95b814

drivers/usb/host/ehci-hub.c

+2 −1
Original line number Diff line number Diff line
@@ -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;