diff options
author | Matthieu CASTET <matthieu.castet@parrot.com> | 2011-02-15 12:40:28 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-02-17 13:57:13 -0500 |
commit | bcf40815e0cda371cecc242398fe39b873bb1047 (patch) | |
tree | 19d63e63e3b62aafa41040f7e76d1e5db6e748bd /drivers/usb/host/ehci-orion.c | |
parent | e2904ee43c7009e6c4fc18738f15051312f22483 (diff) |
USB: don't run ehci_reset in ehci_run for tdi device
TDI driver does the ehci_reset in their reset callback.
Don't reset in ehci_run because configuration settings done in
platform driver will be reset.
This will allow to make msm use ehci_run.
Signed-off-by: Matthieu CASTET <castet.matthieu@parrot.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/host/ehci-orion.c')
-rw-r--r-- | drivers/usb/host/ehci-orion.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/usb/host/ehci-orion.c b/drivers/usb/host/ehci-orion.c index 0f87dc72820..281e094e1c1 100644 --- a/drivers/usb/host/ehci-orion.c +++ b/drivers/usb/host/ehci-orion.c | |||
@@ -105,7 +105,8 @@ static int ehci_orion_setup(struct usb_hcd *hcd) | |||
105 | struct ehci_hcd *ehci = hcd_to_ehci(hcd); | 105 | struct ehci_hcd *ehci = hcd_to_ehci(hcd); |
106 | int retval; | 106 | int retval; |
107 | 107 | ||
108 | ehci_reset(ehci); | 108 | hcd->has_tt = 1; |
109 | |||
109 | retval = ehci_halt(ehci); | 110 | retval = ehci_halt(ehci); |
110 | if (retval) | 111 | if (retval) |
111 | return retval; | 112 | return retval; |
@@ -117,7 +118,7 @@ static int ehci_orion_setup(struct usb_hcd *hcd) | |||
117 | if (retval) | 118 | if (retval) |
118 | return retval; | 119 | return retval; |
119 | 120 | ||
120 | hcd->has_tt = 1; | 121 | ehci_reset(ehci); |
121 | 122 | ||
122 | ehci_port_power(ehci, 0); | 123 | ehci_port_power(ehci, 0); |
123 | 124 | ||