浏览代码

mtd: rawnand: lpc32xx_mlc: fix the probe function error path

An error after nand_scan_tail() should trigger a nand_cleanup() and not
a nand_release(). The latter doing an mtd_device_unregister() which is
not needed if mtd_device_register() failed.

Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com>
Miquel Raynal 7 年之前
父节点
当前提交
838c07b05b
共有 1 个文件被更改,包括 3 次插入3 次删除
  1. 3 3
      drivers/mtd/nand/raw/lpc32xx_mlc.c

+ 3 - 3
drivers/mtd/nand/raw/lpc32xx_mlc.c

@@ -806,12 +806,12 @@ static int lpc32xx_nand_probe(struct platform_device *pdev)
 	res = mtd_device_register(mtd, host->ncfg->parts,
 	res = mtd_device_register(mtd, host->ncfg->parts,
 				  host->ncfg->num_parts);
 				  host->ncfg->num_parts);
 	if (res)
 	if (res)
-		goto release_nand;
+		goto cleanup_nand;
 
 
 	return 0;
 	return 0;
 
 
-release_nand:
-	nand_release(mtd);
+cleanup_nand:
+	nand_cleanup(nand_chip);
 free_irq:
 free_irq:
 	free_irq(host->irq, host);
 	free_irq(host->irq, host);
 release_dma_chan:
 release_dma_chan: