]> git.proxmox.com Git - mirror_ubuntu-focal-kernel.git/commitdiff
mtd: nand: marvell: Fix missing memory allocation modifier
authorMiquel Raynal <miquel.raynal@free-electrons.com>
Fri, 19 Jan 2018 17:39:01 +0000 (18:39 +0100)
committerBoris Brezillon <boris.brezillon@free-electrons.com>
Sat, 20 Jan 2018 09:37:50 +0000 (10:37 +0100)
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: 02f26ecf8c77 ("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>
drivers/mtd/nand/marvell_nand.c

index f15ab37edf4e6313934d87bcf0f2d7f588fba789..2196f2a233d6bc935d31fc3f794ea5f5aa76d621 100644 (file)
@@ -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;