Commit c495a927 authored Jan 19, 2018 by Miquel Raynal Committed by Boris Brezillon Jan 20, 2018

mtd: nand: marvell: Fix missing memory allocation modifier



The function marvell_nfc_init_dma() allocates a DMA buffer without the
GFP_KERNEL modifier, that triggers this warning:
"marvell_nfc_init_dma() error: no modifiers for allocation."

Fix this by using (GFP_KERNEL | GFP_DMA) instead of only GFP_DMA as the
probe happens in non-interrupt context.

Fixes: 02f26ecf ("mtd: nand: add reworked Marvell NAND controller driver")
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Miquel Raynal <miquel.raynal@free-electrons.com>
Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>

parent e06a181b

drivers/mtd/nand/marvell_nand.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -2649,7 +2649,7 @@ static int marvell_nfc_init_dma(struct marvell_nfc *nfc)
		* for DMA transfers and then copy the desired amount of data to
		* the provided buffer.
		*/
		nfc->dma_buf = kmalloc(MAX_CHUNK_SIZE, GFP_DMA);
		nfc->dma_buf = kmalloc(MAX_CHUNK_SIZE, GFP_KERNEL \| GFP_DMA);
		if (!nfc->dma_buf)
		return -ENOMEM;