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

Commit bc337b51 authored by Marc Ohlf's avatar Marc Ohlf Committed by Greg Kroah-Hartman
Browse files

usb: ehci: change order of register cleanup during shutdown 



In ehci_turn_off_all_ports() all EHCI port registers are cleared to zero.
On some hardware, this can lead to an system hang,
when ehci_port_power() accesses the already cleared registers.

This patch changes the order of cleanup.
First call ehci_port_power() which respects the current bits in
port status registers
and afterwards cleanup the hard way by setting everything to zero.

Signed-off-by: default avatarMarc Ohlf <ohlf@mkt-sys.de>
Acked-by: default avatarAlan Stern <stern@rowland.harvard.edu>
CC: <stable@vger.kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent aed9d65a

drivers/usb/host/ehci-hcd.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -332,11 +332,11 @@ static void ehci_turn_off_all_ports(struct ehci_hcd *ehci) 
	int	port = HCS_N_PORTS(ehci->hcs_params);

	int	port = HCS_N_PORTS(ehci->hcs_params);





	while (port--) {

	while (port--) {

		ehci_writel(ehci, PORT_RWC_BITS,

				&ehci->regs->port_status[port]);

		spin_unlock_irq(&ehci->lock);

		spin_unlock_irq(&ehci->lock);

		ehci_port_power(ehci, port, false);

		ehci_port_power(ehci, port, false);

		spin_lock_irq(&ehci->lock);

		spin_lock_irq(&ehci->lock);

		ehci_writel(ehci, PORT_RWC_BITS,

				&ehci->regs->port_status[port]);

	}

	}

}

}