summaryrefslogtreecommitdiffstats
path: root/drivers/usb/host/ehci-w90x900.c
diff options
context:
space:
mode:
authorGeoff Levand <geoff@infradead.org>2011-11-22 18:04:45 -0800
committerGeoff Levand <geoff@infradead.org>2011-12-08 09:38:53 -0800
commit876e0df902c726408c84b75dab673a90fd492e1d (patch)
tree9af8a84b8bedb6e727067e57355be5996d4bcabd /drivers/usb/host/ehci-w90x900.c
parent5611cc4572e889b62a7b4c72a413536bf6a9c416 (diff)
downloadtalos-op-linux-876e0df902c726408c84b75dab673a90fd492e1d.tar.gz
talos-op-linux-876e0df902c726408c84b75dab673a90fd492e1d.zip
usb: Remove ehci_reset call from ehci_run
Remove the ehci_reset() call done in the ehci_run() routine of the USB EHCI host controller driver and add an ehci_reset() call to the probe processing of all EHCI platform drivers that do not already call ehci_reset(). The call to ehci_reset() from ehci_run() was problematic for several platform drivers, and unnecessary for others. This change moves the decision to call ehci_reset() at driver startup to the platform driver code. Signed-off-by: Geoff Levand <geoff@infradead.org> Acked-by: Alan Stern <stern@rowland.harvard.edu>
Diffstat (limited to 'drivers/usb/host/ehci-w90x900.c')
-rw-r--r--drivers/usb/host/ehci-w90x900.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/usb/host/ehci-w90x900.c b/drivers/usb/host/ehci-w90x900.c
index d661cf7de140..3d2e26cbb34c 100644
--- a/drivers/usb/host/ehci-w90x900.c
+++ b/drivers/usb/host/ehci-w90x900.c
@@ -78,6 +78,8 @@ static int __devinit usb_w90x900_probe(const struct hc_driver *driver,
if (irq < 0)
goto err4;
+ ehci_reset(ehci);
+
retval = usb_add_hcd(hcd, irq, IRQF_SHARED);
if (retval != 0)
goto err4;
OpenPOWER on IntegriCloud