diff options
| author | Geoff Levand <geoff@infradead.org> | 2011-11-23 03:04:45 +0100 |
|---|---|---|
| committer | Geoff Levand <geoff@infradead.org> | 2011-12-08 18:38:53 +0100 |
| commit | 876e0df902c726408c84b75dab673a90fd492e1d (patch) | |
| tree | 9af8a84b8bedb6e727067e57355be5996d4bcabd /drivers/usb/host/ehci-octeon.c | |
| parent | Linux 3.2-rc4 (diff) | |
| download | linux-876e0df902c726408c84b75dab673a90fd492e1d.tar.xz 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-octeon.c')
| -rw-r--r-- | drivers/usb/host/ehci-octeon.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/usb/host/ehci-octeon.c b/drivers/usb/host/ehci-octeon.c index ba1f51361134..c0104882c72d 100644 --- a/drivers/usb/host/ehci-octeon.c +++ b/drivers/usb/host/ehci-octeon.c @@ -155,6 +155,8 @@ static int ehci_octeon_drv_probe(struct platform_device *pdev) /* cache this readonly data; minimize chip reads */ ehci->hcs_params = ehci_readl(ehci, &ehci->caps->hcs_params); + ehci_reset(ehci); + ret = usb_add_hcd(hcd, irq, IRQF_SHARED); if (ret) { dev_dbg(&pdev->dev, "failed to add hcd with err %d\n", ret); |