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

Commit d3512f63 authored by Sarah Sharp's avatar Sarah Sharp Committed by Greg Kroah-Hartman
Browse files

USB: xhci: Don't oops if the host doesn't halt. 



Signed-off-by: default avatarSarah Sharp <sarah.a.sharp@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 66e49d87

drivers/usb/host/xhci-hcd.c

+4 −1
Original line number Diff line number Diff line
@@ -103,7 +103,10 @@ int xhci_reset(struct xhci_hcd *xhci) 
	u32 state;



	state = xhci_readl(xhci, &xhci->op_regs->status);

	BUG_ON((state & STS_HALT) == 0);

	if ((state & STS_HALT) == 0) {

		xhci_warn(xhci, "Host controller not halted, aborting reset.\n");

		return 0;

	}



	xhci_dbg(xhci, "// Reset the HC\n");

	command = xhci_readl(xhci, &xhci->op_regs->command);