]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
mtd: rawnand: cadence: Fix error check for dma_alloc_coherent() in cadence_nand_init()
authorChen Ni <nichen@iscas.ac.cn>
Mon, 9 Feb 2026 07:56:18 +0000 (15:56 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 25 Mar 2026 10:08:49 +0000 (11:08 +0100)
commit 0410e1a4c545c769c59c6eda897ad5d574d0c865 upstream.

Fix wrong variable used for error checking after dma_alloc_coherent()
call. The function checks cdns_ctrl->dma_cdma_desc instead of
cdns_ctrl->cdma_desc, which could lead to incorrect error handling.

Fixes: ec4ba01e894d ("mtd: rawnand: Add new Cadence NAND driver to MTD subsystem")
Cc: stable@vger.kernel.org
Signed-off-by: Chen Ni <nichen@iscas.ac.cn>
Reviewed-by: Alok Tiwari <alok.a.tiwari@oracle.com>
Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/mtd/nand/raw/cadence-nand-controller.c

index 5872f1dfe7016482ebc754329fc322bfa34a1c52..636af179579fe5b05504884b4c5a6a377a3481dd 100644 (file)
@@ -2878,7 +2878,7 @@ static int cadence_nand_init(struct cdns_nand_ctrl *cdns_ctrl)
                                                  sizeof(*cdns_ctrl->cdma_desc),
                                                  &cdns_ctrl->dma_cdma_desc,
                                                  GFP_KERNEL);
-       if (!cdns_ctrl->dma_cdma_desc)
+       if (!cdns_ctrl->cdma_desc)
                return -ENOMEM;
 
        cdns_ctrl->buf_size = SZ_16K;