]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
usb: xhci-mem: use passed in GFP flags instead of GFP_KERNEL
authorDan Carpenter <dan.carpenter@oracle.com>
Thu, 10 Nov 2016 19:33:17 +0000 (22:33 +0300)
committerJiri Slaby <jslaby@suse.cz>
Thu, 26 Jan 2017 16:39:43 +0000 (17:39 +0100)
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: Jiri Slaby <jslaby@suse.cz>
drivers/usb/host/xhci-mem.c

index f2fae31fe79b66f15b58735e6fe38bd7857bf23f..34323aa444e33859b1ff3746d364cd9f4a55a861 100644 (file)
@@ -2304,7 +2304,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));
@@ -2399,7 +2399,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,