Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bcf40815 authored by Matthieu CASTET's avatar Matthieu CASTET Committed by Greg Kroah-Hartman
Browse files

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: default avatarMatthieu CASTET <castet.matthieu@parrot.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent e2904ee4

drivers/usb/host/ehci-hcd.c

+6 −1
Original line number Diff line number Diff line
@@ -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;

	}

drivers/usb/host/ehci-orion.c

+3 −2
Original line number Diff line number Diff line
@@ -105,7 +105,8 @@ static int ehci_orion_setup(struct usb_hcd *hcd) 
	struct ehci_hcd *ehci = hcd_to_ehci(hcd);

	int retval;



	ehci_reset(ehci);

	hcd->has_tt = 1;



	retval = ehci_halt(ehci);

	if (retval)

		return retval;
@@ -117,7 +118,7 @@ static int ehci_orion_setup(struct usb_hcd *hcd) 
	if (retval)

		return retval;



	hcd->has_tt = 1;

	ehci_reset(ehci);



	ehci_port_power(ehci, 0);