diff options
author | Geoff Levand <geoff@infradead.org> | 2011-11-22 21:04:45 -0500 |
---|---|---|
committer | Geoff Levand <geoff@infradead.org> | 2011-12-08 12:38:53 -0500 |
commit | 876e0df902c726408c84b75dab673a90fd492e1d (patch) | |
tree | 9af8a84b8bedb6e727067e57355be5996d4bcabd /drivers/usb/host/ehci-omap.c | |
parent | 5611cc4572e889b62a7b4c72a413536bf6a9c416 (diff) |
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-omap.c')
-rw-r--r-- | drivers/usb/host/ehci-omap.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/usb/host/ehci-omap.c b/drivers/usb/host/ehci-omap.c index e39b0297bad1..e33baf9052cb 100644 --- a/drivers/usb/host/ehci-omap.c +++ b/drivers/usb/host/ehci-omap.c | |||
@@ -228,6 +228,8 @@ static int ehci_hcd_omap_probe(struct platform_device *pdev) | |||
228 | /* cache this readonly data; minimize chip reads */ | 228 | /* cache this readonly data; minimize chip reads */ |
229 | omap_ehci->hcs_params = readl(&omap_ehci->caps->hcs_params); | 229 | omap_ehci->hcs_params = readl(&omap_ehci->caps->hcs_params); |
230 | 230 | ||
231 | ehci_reset(omap_ehci); | ||
232 | |||
231 | ret = usb_add_hcd(hcd, irq, IRQF_SHARED); | 233 | ret = usb_add_hcd(hcd, irq, IRQF_SHARED); |
232 | if (ret) { | 234 | if (ret) { |
233 | dev_err(dev, "failed to add hcd with err %d\n", ret); | 235 | dev_err(dev, "failed to add hcd with err %d\n", ret); |