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-hcd.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-hcd.c')
-rw-r--r-- | drivers/usb/host/ehci-hcd.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c index 74dcf49bd015..4c77a818fd80 100644 --- a/drivers/usb/host/ehci-hcd.c +++ b/drivers/usb/host/ehci-hcd.c | |||
@@ -679,7 +679,12 @@ static int ehci_run (struct usb_hcd *hcd) | |||
679 | hcd->uses_new_polling = 1; | 679 | hcd->uses_new_polling = 1; |
680 | 680 | ||
681 | /* EHCI spec section 4.1 */ | 681 | /* EHCI spec section 4.1 */ |
682 | if ((retval = ehci_reset(ehci)) != 0) { | 682 | /* |
683 | * TDI driver does the ehci_reset in their reset callback. | ||
684 | * Don't reset here, because configuration settings will | ||
685 | * vanish. | ||
686 | */ | ||
687 | if (!ehci_is_TDI(ehci) && (retval = ehci_reset(ehci)) != 0) { | ||
683 | ehci_mem_cleanup(ehci); | 688 | ehci_mem_cleanup(ehci); |
684 | return retval; | 689 | return retval; |
685 | } | 690 | } |