lkml.org 
[lkml]   [2017]   [Jan]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.9 063/206] usb: xhci-mem: use passed in GFP flags instead of GFP_KERNEL
    Date
    4.9-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Dan Carpenter <dan.carpenter@oracle.com>

    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>

    ---
    drivers/usb/host/xhci-mem.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    --- 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,
    * "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,

    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,

    \
     
     \ /
      Last update: 2017-01-10 15:46    [W:4.549 / U:0.056 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site