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

Commit 269f0532 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman Committed by Greg Kroah-Hartman
Browse files

Revert "USB: improve ehci_watchdog's side effect in CPU power management" 



This reverts commit f0d781d5.

It was the wrong thing to do, and does not really do what it said
it did.

Cc: Yi Yang <yi.y.yang@intel.com>
Cc: David Brownell <dbrownell@users.sourceforge.net>
Cc: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent d9d060a9

drivers/usb/host/ehci.h

+5 −7
Original line number Diff line number Diff line
@@ -183,16 +183,14 @@ timer_action (struct ehci_hcd *ehci, enum ehci_timer_action action) 
	 * the async ring; just the I/O watchdog.  Note that if a

	 * SHRINK were pending, OFF would never be requested.

	 */

	enum ehci_timer_action oldactions = ehci->actions;



	if (!test_and_set_bit (action, &ehci->actions)) {

		unsigned long t;



	if (timer_pending(&ehci->watchdog)

			&& ((BIT(TIMER_ASYNC_SHRINK) | BIT(TIMER_ASYNC_OFF))

				& oldactions))

				& ehci->actions))

		return;



	if (!test_and_set_bit (action, &ehci->actions)) {

		unsigned long t;



		switch (action) {

		case TIMER_IO_WATCHDOG:

			t = EHCI_IO_JIFFIES;
@@ -208,7 +206,7 @@ timer_action (struct ehci_hcd *ehci, enum ehci_timer_action action) 
			t = DIV_ROUND_UP(EHCI_SHRINK_FRAMES * HZ, 1000) + 1;

			break;

		}

		mod_timer(&ehci->watchdog, round_jiffies(t + jiffies));

		mod_timer(&ehci->watchdog, t + jiffies);

	}

}