OSDN Git Service

mtd: rawnand: cafe: fix probe function error path
authorMiquel Raynal <miquel.raynal@bootlin.com>
Wed, 21 Mar 2018 13:01:43 +0000 (14:01 +0100)
committerBoris Brezillon <boris.brezillon@bootlin.com>
Thu, 29 Mar 2018 07:38:18 +0000 (09:38 +0200)
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@bootlin.com>
Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com>
drivers/mtd/nand/raw/cafe_nand.c

index 3c1b6a3..d8c8c9d 100644 (file)
@@ -774,10 +774,14 @@ 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;
 
+ out_cleanup_nand:
+       nand_cleanup(&cafe->nand);
  out_free_dma:
        dma_free_coherent(&cafe->pdev->dev, 2112, cafe->dmabuf, cafe->dmaaddr);
  out_irq: