Commit 5a45bdd3 authored by Dan Carpenter's avatar Dan Carpenter Committed by Willy Tarreau

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

commit c95a9f83 upstream.

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 avatarJiri Slaby <jslaby@suse.cz>
Signed-off-by: default avatarWilly Tarreau <w@1wt.eu>
parent 56a4835e
...@@ -2306,7 +2306,7 @@ int xhci_mem_init(struct xhci_hcd *xhci, gfp_t flags) ...@@ -2306,7 +2306,7 @@ int xhci_mem_init(struct xhci_hcd *xhci, gfp_t flags)
* "physically contiguous and 64-byte (cache line) aligned". * "physically contiguous and 64-byte (cache line) aligned".
*/ */
xhci->dcbaa = dma_alloc_coherent(dev, sizeof(*xhci->dcbaa), &dma, xhci->dcbaa = dma_alloc_coherent(dev, sizeof(*xhci->dcbaa), &dma,
GFP_KERNEL); flags);
if (!xhci->dcbaa) if (!xhci->dcbaa)
goto fail; goto fail;
memset(xhci->dcbaa, 0, sizeof *(xhci->dcbaa)); memset(xhci->dcbaa, 0, sizeof *(xhci->dcbaa));
...@@ -2397,7 +2397,7 @@ int xhci_mem_init(struct xhci_hcd *xhci, gfp_t flags) ...@@ -2397,7 +2397,7 @@ int xhci_mem_init(struct xhci_hcd *xhci, gfp_t flags)
xhci->erst.entries = dma_alloc_coherent(dev, xhci->erst.entries = dma_alloc_coherent(dev,
sizeof(struct xhci_erst_entry) * ERST_NUM_SEGS, &dma, sizeof(struct xhci_erst_entry) * ERST_NUM_SEGS, &dma,
GFP_KERNEL); flags);
if (!xhci->erst.entries) if (!xhci->erst.entries)
goto fail; goto fail;
xhci_dbg(xhci, "// Allocated event ring segment table at 0x%llx\n", xhci_dbg(xhci, "// Allocated event ring segment table at 0x%llx\n",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment