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

Commit cd4cdc93 authored by David Brownell's avatar David Brownell Committed by Greg Kroah-Hartman
Browse files

usb: ehci, remove false clear-reset path 



Some of the "EHCI ports reset forever" problems may be explained by
code paths which wrongly flagged resets as complete.  This removes
two such paths; the ehci_hub_status_data() path should be the only one
to have an effect, since it was already properly flagged on the other
path.  (Issue noted by Minhyoung Kim <a9a9@lge.com>.)

Signed-off-by: default avatarDavid Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent b75be4ab

drivers/usb/host/ehci-hub.c

+1 −5
Original line number Diff line number Diff line
@@ -411,10 +411,8 @@ static int check_reset_complete ( 
	u32 __iomem	*status_reg,

	int		port_status

) {

	if (!(port_status & PORT_CONNECT)) {

		ehci->reset_done [index] = 0;

	if (!(port_status & PORT_CONNECT))

		return port_status;

	}



	/* if reset finished and it's still not enabled -- handoff */

	if (!(port_status & PORT_PE)) {
@@ -493,8 +491,6 @@ ehci_hub_status_data (struct usb_hcd *hcd, char *buf) 
		 * controller by the user.

		 */



		if (!(temp & PORT_CONNECT))

			ehci->reset_done [i] = 0;

		if ((temp & mask) != 0

				|| ((temp & PORT_RESUME) != 0

					&& time_after_eq(jiffies,