Commit 49c7ca15 authored Nov 11, 2016 by Mathias Nyman Committed by Jack Pham Mar 19, 2018

xhci: remove unnecessary xhci_quiesce call before xhci_halt



Fist function called in xhci_halt is xhci_quiesce, so no point
in calling it twice.

Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Change-Id: Ia90cf475e139de6c594f3fc3f7cbe65568f962df
Git-commit: cf5d344e13655df2fcb049ae212fe59c617349a7
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git


[hemantk@codeaurora.org: resolved merge conflict]
Signed-off-by: Hemant Kumar <hemantk@codeaurora.org>
Signed-off-by: Jack Pham <jackp@codeaurora.org>

parent ee50fe6e

drivers/usb/host/xhci-ring.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -353,7 +353,6 @@ static int xhci_abort_cmd_ring(struct xhci_hcd *xhci, unsigned long flags)
		xhci_err(xhci, "Stopped the command ring failed, "
		"maybe the host is dead\n");
		xhci->xhc_state \|= XHCI_STATE_DYING;
		xhci_quiesce(xhci);
		xhci_halt(xhci);
		return -ESHUTDOWN;
		}