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-s5p.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-s5p.c')
-rw-r--r-- | drivers/usb/host/ehci-s5p.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/usb/host/ehci-s5p.c b/drivers/usb/host/ehci-s5p.c index 024b65c4990d..397f827387b7 100644 --- a/drivers/usb/host/ehci-s5p.c +++ b/drivers/usb/host/ehci-s5p.c | |||
@@ -136,6 +136,8 @@ static int __devinit s5p_ehci_probe(struct platform_device *pdev) | |||
136 | /* cache this readonly data; minimize chip reads */ | 136 | /* cache this readonly data; minimize chip reads */ |
137 | ehci->hcs_params = readl(&ehci->caps->hcs_params); | 137 | ehci->hcs_params = readl(&ehci->caps->hcs_params); |
138 | 138 | ||
139 | ehci_reset(ehci); | ||
140 | |||
139 | err = usb_add_hcd(hcd, irq, IRQF_SHARED); | 141 | err = usb_add_hcd(hcd, irq, IRQF_SHARED); |
140 | if (err) { | 142 | if (err) { |
141 | dev_err(&pdev->dev, "Failed to add USB HCD\n"); | 143 | dev_err(&pdev->dev, "Failed to add USB HCD\n"); |