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

Commit c95a9f83 authored by Dan Carpenter's avatar Dan Carpenter Committed by Greg Kroah-Hartman
Browse files

usb: xhci-mem: use passed in GFP flags instead of GFP_KERNEL 



We normally use the passed in gfp flags for allocations, it's just these
two which were missed.

Fixes: 22d45f01 ("usb/xhci: replace pci_*_consistent() with dma_*_coherent()")
Cc: Mathias Nyman <mathias.nyman@intel.com>
Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Acked-by: default avatarSebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a8bac371

drivers/usb/host/xhci-mem.c

+2 −2
Original line number Diff line number Diff line
@@ -2383,7 +2383,7 @@ int xhci_mem_init(struct xhci_hcd *xhci, gfp_t flags) 
	 * "physically contiguous and 64-byte (cache line) aligned".

	 */

	xhci->dcbaa = dma_alloc_coherent(dev, sizeof(*xhci->dcbaa), &dma,

			GFP_KERNEL);

			flags);

	if (!xhci->dcbaa)

		goto fail;

	memset(xhci->dcbaa, 0, sizeof *(xhci->dcbaa));
@@ -2479,7 +2479,7 @@ int xhci_mem_init(struct xhci_hcd *xhci, gfp_t flags) 


	xhci->erst.entries = dma_alloc_coherent(dev,

			sizeof(struct xhci_erst_entry) * ERST_NUM_SEGS, &dma,

			GFP_KERNEL);

			flags);

	if (!xhci->erst.entries)

		goto fail;

	xhci_dbg_trace(xhci, trace_xhci_dbg_init,