From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx2.suse.de ([195.135.220.15]:48277 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751145AbdAUHly (ORCPT ); Sat, 21 Jan 2017 02:41:54 -0500 From: Jiri Slaby To: stable@vger.kernel.org Cc: Dan Carpenter , Mathias Nyman , Jiri Slaby Subject: [patch added to 3.12-stable] usb: xhci-mem: use passed in GFP flags instead of GFP_KERNEL Date: Sat, 21 Jan 2017 08:40:39 +0100 Message-Id: <20170121074102.25260-42-jslaby@suse.cz> In-Reply-To: <20170121074102.25260-1-jslaby@suse.cz> References: <20170121074102.25260-1-jslaby@suse.cz> Sender: stable-owner@vger.kernel.org List-ID: From: Dan Carpenter This patch has been added to the 3.12 stable tree. If you have any objections, please let us know. =============== 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 Signed-off-by: Dan Carpenter Acked-by: Sebastian Andrzej Siewior Signed-off-by: Jiri Slaby --- drivers/usb/host/xhci-mem.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/usb/host/xhci-mem.c b/drivers/usb/host/xhci-mem.c index f2fae31fe79b..34323aa444e3 100644 --- a/drivers/usb/host/xhci-mem.c +++ b/drivers/usb/host/xhci-mem.c @@ -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, -- 2.11.0