[PATCH] mtd: rawnand: cadence: Fix error check for dma_alloc_coherent() in cadence_nand_init()

[PATCH] mtd: rawnand: cadence: Fix error check for dma_alloc_coherent() in cadence_nand_init()

[Chen Ni]

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")
Signed-off-by: Chen Ni <nichen@iscas.ac.cn>
---
 drivers/mtd/nand/raw/cadence-nand-controller.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/mtd/nand/raw/cadence-nand-controller.c b/drivers/mtd/nand/raw/cadence-nand-controller.c
index 99135ec23010..d53b35a8b3cb 100644
--- a/drivers/mtd/nand/raw/cadence-nand-controller.c
+++ b/drivers/mtd/nand/raw/cadence-nand-controller.c
@@ -3133,7 +3133,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;
-- 
2.25.1

Re: [PATCH] mtd: rawnand: cadence: Fix error check for dma_alloc_coherent() in cadence_nand_init()

[ALOK TIWARI]

On 2/9/2026 1:26 PM, Chen Ni wrote:
> 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")
> Signed-off-by: Chen Ni<nichen@iscas.ac.cn>
> ---
>   drivers/mtd/nand/raw/cadence-nand-controller.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/mtd/nand/raw/cadence-nand-controller.c b/drivers/mtd/nand/raw/cadence-nand-controller.c
> index 99135ec23010..d53b35a8b3cb 100644
> --- a/drivers/mtd/nand/raw/cadence-nand-controller.c
> +++ b/drivers/mtd/nand/raw/cadence-nand-controller.c
> @@ -3133,7 +3133,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;

LGTM,

Reviewed-by: Alok Tiwari <alok.a.tiwari@oracle.com>

Thanks,
Alok

Re: [PATCH] mtd: rawnand: cadence: Fix error check for dma_alloc_coherent() in cadence_nand_init()

[Miquel Raynal]

On Mon, 09 Feb 2026 15:56:18 +0800, Chen Ni wrote:
> 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.
> 
> 

Applied to mtd/fixes, thanks!

[1/1] mtd: rawnand: cadence: Fix error check for dma_alloc_coherent() in cadence_nand_init()
      commit: 0410e1a4c545c769c59c6eda897ad5d574d0c865

Patche(s) should be available on mtd/linux.git and will be
part of the next PR (provided that no robot complains by then).

Kind regards,
Miquèl