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)
         hcd->uses_new_polling = 1;
 
         /* EHCI spec section 4.1 */
-        if ((retval = ehci_reset(ehci)) != 0) {
+        /*
+         * TDI driver does the ehci_reset in their reset callback.
+         * Don't reset here, because configuration settings will
+         * vanish.
+         */
+        if (!ehci_is_TDI(ehci) && (retval = ehci_reset(ehci)) != 0) {
                 ehci_mem_cleanup(ehci);
                 return retval;
         }