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

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

USB: EHCI: remove unneeded suspend/resume code 



This patch (as1566) removes the code in ehci-hcd's resume routines
which tries to restart or cancel any transfers left active while the
root hub or controller was asleep.  This code isn't necessary, because
all URBs are terminated before the root hub is suspended.

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

drivers/usb/host/ehci-hcd.c

+0 −7
Original line number Diff line number Diff line
@@ -1312,13 +1312,6 @@ static int __maybe_unused ehci_resume(struct usb_hcd *hcd, bool hibernated) 
	(void) ehci_halt(ehci);

	(void) ehci_reset(ehci);



	/* emptying the schedule aborts any urbs */

	spin_lock_irq(&ehci->lock);

	if (ehci->reclaim)

		end_unlink_async(ehci);

	ehci_work(ehci);

	spin_unlock_irq(&ehci->lock);



	ehci_writel(ehci, ehci->command, &ehci->regs->command);

	ehci_writel(ehci, FLAG_CF, &ehci->regs->configured_flag);

	ehci_readl(ehci, &ehci->regs->command);	/* unblock posted writes */

drivers/usb/host/ehci-hub.c

+1 −12
Original line number Diff line number Diff line
@@ -424,23 +424,12 @@ static int ehci_bus_resume (struct usb_hcd *hcd) 
			ehci_vdbg (ehci, "resumed port %d\n", i + 1);

		}

	}

	(void) ehci_readl(ehci, &ehci->regs->command);



	/* maybe re-activate the schedule(s) */

	temp = 0;

	if (ehci->async->qh_next.qh)

		temp |= CMD_ASE;

	if (ehci->periodic_sched)

		temp |= CMD_PSE;

	if (temp) {

		ehci->command |= temp;

		ehci_writel(ehci, ehci->command, &ehci->regs->command);

	}



	ehci->next_statechange = jiffies + msecs_to_jiffies(5);



	/* Now we can safely re-enable irqs */

	ehci_writel(ehci, INTR_MASK, &ehci->regs->intr_enable);

	(void) ehci_readl(ehci, &ehci->regs->intr_enable);



	spin_unlock_irq (&ehci->lock);

	ehci_handover_companion_ports(ehci);