| From da109607cb7820793ca4ed05de0d4ca32681edba Mon Sep 17 00:00:00 2001 |
| From: Dan Carpenter <dan.carpenter@oracle.com> |
| Date: Thu, 10 Nov 2016 22:33:17 +0300 |
| Subject: [PATCH] usb: xhci-mem: use passed in GFP flags instead of GFP_KERNEL |
| |
| commit c95a9f83711bf53faeb4ed9bbb63a3f065613dfb upstream. |
| |
| We normally use the passed in gfp flags for allocations, it's just these |
| two which were missed. |
| |
| Fixes: 22d45f01a836 ("usb/xhci: replace pci_*_consistent() with dma_*_coherent()") |
| Cc: Mathias Nyman <mathias.nyman@intel.com> |
| Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> |
| Acked-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/drivers/usb/host/xhci-mem.c b/drivers/usb/host/xhci-mem.c |
| index b3a5cd86e86c..495ffc01fa89 100644 |
| --- a/drivers/usb/host/xhci-mem.c |
| +++ b/drivers/usb/host/xhci-mem.c |
| @@ -2418,7 +2418,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)); |
| @@ -2514,7 +2514,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, |
| -- |
| 2.10.1 |
| |
