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

Commit 20a09a2e authored by Mathias Nyman's avatar Mathias Nyman Committed by Greg Kroah-Hartman
Browse files

usb: xhci: dbc: Don't free all memory with spinlock held



commit 8867ea262196a6945c24a0fb739575af646ec0e9 upstream.

The xhci debug capability (DbC) feature did its memory cleanup with
spinlock held. dma_free_coherent() warns if called with interrupts
disabled

move the memory cleanup outside the spinlock

Cc: stable <stable@vger.kernel.org>
Signed-off-by: default avatarMathias Nyman <mathias.nyman@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c81b8722
Loading
Loading
Loading
Loading
+3 −2
Original line number Diff line number Diff line
@@ -516,7 +516,6 @@ static int xhci_do_dbc_stop(struct xhci_hcd *xhci)
		return -1;

	writel(0, &dbc->regs->control);
	xhci_dbc_mem_cleanup(xhci);
	dbc->state = DS_DISABLED;

	return 0;
@@ -562,9 +561,11 @@ static void xhci_dbc_stop(struct xhci_hcd *xhci)
	ret = xhci_do_dbc_stop(xhci);
	spin_unlock_irqrestore(&dbc->lock, flags);

	if (!ret)
	if (!ret) {
		xhci_dbc_mem_cleanup(xhci);
		pm_runtime_put_sync(xhci_to_hcd(xhci)->self.controller);
	}
}

static void
dbc_handle_port_status(struct xhci_hcd *xhci, union xhci_trb *event)