From: Benoit Goby Date: Tue, 28 Dec 2010 23:33:49 +0000 (-0800) Subject: usb: ehci: tegra: Don't change the hcd state on restart X-Git-Tag: firefly_0821_release~9833^2~77^2~4 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=c901a0736adb6d309b54dc94cc9ab05142b1d5df;p=firefly-linux-kernel-4.4.55.git usb: ehci: tegra: Don't change the hcd state on restart usbcore will change it once the bus has been resumed. This fixes the "hub 3-0:1.0: activate --> -22" error on resume. Change-Id: Icff283a60634b4d003e77aafb5a5127d415cbd3f Signed-off-by: Benoit Goby --- diff --git a/drivers/usb/host/ehci-tegra.c b/drivers/usb/host/ehci-tegra.c index d990c1cd9181..21c58dfb9035 100644 --- a/drivers/usb/host/ehci-tegra.c +++ b/drivers/usb/host/ehci-tegra.c @@ -211,7 +211,6 @@ static void tegra_ehci_restart(struct usb_hcd *hcd) ehci_writel(ehci, ehci->command, &ehci->regs->command); down_write(&ehci_cf_port_reset_rwsem); - hcd->state = HC_STATE_RUNNING; ehci_writel(ehci, FLAG_CF, &ehci->regs->configured_flag); /* flush posted writes */ ehci_readl(ehci, &ehci->regs->command);