]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
xhci: remove unnecessary xhci_quiesce call before xhci_halt
authorMathias Nyman <mathias.nyman@linux.intel.com>
Fri, 11 Nov 2016 13:13:10 +0000 (15:13 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 14 Nov 2016 09:18:21 +0000 (10:18 +0100)
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>
drivers/usb/host/xhci-ring.c

index 797137e26549b566474d99e1d3e6efe277aa4648..e8a9450ebd526729beffb7b380fc1cc44e776a0a 100644 (file)
@@ -303,7 +303,6 @@ static int xhci_abort_cmd_ring(struct xhci_hcd *xhci)
                                "maybe the host is dead\n");
                del_timer(&xhci->cmd_timer);
                xhci->xhc_state |= XHCI_STATE_DYING;
-               xhci_quiesce(xhci);
                xhci_halt(xhci);
                return -ESHUTDOWN;
        }