Merge tag 'dmaengine-5.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul...

[sfrench/cifs-2.6.git] / drivers / dma / xilinx / xilinx_dma.c

diff --git a/drivers/dma/xilinx/xilinx_dma.c b/drivers/dma/xilinx/xilinx_dma.c
index 79777550a6ffc2e8db8e6fbb472f4b8fa55f9c12..3aded7861fef85bcc2b38de15dd4bbc2b42dedb1 100644 (file)
--- a/drivers/dma/xilinx/xilinx_dma.c
+++ b/drivers/dma/xilinx/xilinx_dma.c
@@ -800,7 +800,7 @@ xilinx_dma_alloc_tx_descriptor(struct xilinx_dma_chan *chan)
 {
        struct xilinx_dma_tx_descriptor *desc;
 
-       desc = kzalloc(sizeof(*desc), GFP_KERNEL);
+       desc = kzalloc(sizeof(*desc), GFP_NOWAIT);
        if (!desc)
                return NULL;