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

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

USB: EHCI: fix up incorrect merge resolution 



This patch (as1671) fixes up an incorrect resolution of a merge
conflict between Greg KH's usb-linus branch and his usb-next branch.

Signed-off-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 29727f3b

drivers/usb/host/ehci-timer.c

+9 −0
Original line number Diff line number Diff line
@@ -297,6 +297,15 @@ static void ehci_iaa_watchdog(struct ehci_hcd *ehci) 
{

	u32 cmd, status;



	/*

	 * Lost IAA irqs wedge things badly; seen first with a vt8235.

	 * So we need this watchdog, but must protect it against both

	 * (a) SMP races against real IAA firing and retriggering, and

	 * (b) clean HC shutdown, when IAA watchdog was pending.

	 */

	if (ehci->rh_state != EHCI_RH_RUNNING)

		return;



	/* If we get here, IAA is *REALLY* late.  It's barely

	 * conceivable that the system is so busy that CMD_IAAD

	 * is still legitimately set, so let's be sure it's