[PATCH v2 02/16] mtd: rawnand: cafe: fix probe function error path

[Boris Brezillon]

On Wed, 21 Mar 2018 14:01:43 +0100
Miquel Raynal <miquel.raynal at bootlin.com> wrote:

> An error after nand_scan_tail() should trigger a nand_cleanup().
> The helper mtd_device_parse_register() returns an error code that should
> be checked and nand_cleanup() called accordingly.
> 
> Signed-off-by: Miquel Raynal <miquel.raynal at bootlin.com>
> ---
>  drivers/mtd/nand/raw/cafe_nand.c | 18 +++++++++++-------
>  1 file changed, 11 insertions(+), 7 deletions(-)
> 
> diff --git a/drivers/mtd/nand/raw/cafe_nand.c b/drivers/mtd/nand/raw/cafe_nand.c
> index 3c1b6a3786b2..de9682d87a56 100644
> --- a/drivers/mtd/nand/raw/cafe_nand.c
> +++ b/drivers/mtd/nand/raw/cafe_nand.c
> @@ -774,21 +774,25 @@ static int cafe_nand_probe(struct pci_dev *pdev,
>  	pci_set_drvdata(pdev, mtd);
>  
>  	mtd->name = "cafe_nand";
> -	mtd_device_parse_register(mtd, part_probes, NULL, NULL, 0);
> +	err = mtd_device_parse_register(mtd, part_probes, NULL, NULL, 0);
> +	if (err)
> +		goto out_cleanup_nand;
>  
> -	goto out;
> +	return 0;
>  
> - out_free_dma:
> +out_cleanup_nand:
> +	nand_cleanup(&cafe->nand);
> +out_free_dma:
>  	dma_free_coherent(&cafe->pdev->dev, 2112, cafe->dmabuf, cafe->dmaaddr);
> - out_irq:
> +out_irq:
>  	/* Disable NAND IRQ in global IRQ mask register */
>  	cafe_writel(cafe, ~1 & cafe_readl(cafe, GLOBAL_IRQ_MASK), GLOBAL_IRQ_MASK);
>  	free_irq(pdev->irq, mtd);
> - out_ior:
> +out_ior:
>  	pci_iounmap(pdev, cafe->mmio);
> - out_free_mtd:
> +out_free_mtd:
>  	kfree(cafe);
> - out:
> +
>  	return err;
>  }
>  

You're doing more than what's described in your commit message:
- fixing coding style issues
- reworking the success path

I'm not against those changes, but they should definitely be done in
separate patches.

-- 
Boris Brezillon, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com