Commit 18f62614 authored by Martin Blumenstingl's avatar Martin Blumenstingl Committed by Miquel Raynal
Browse files

mtd: rawnand: intel: check the mtd name only after setting the variable 



Move the check for mtd->name after the mtd variable has actually been
initialized.

While here, also drop the NULL assignment to the mtd variable as it's
overwritten later on anyways and the NULL value is never read.

Fixes: 0b1039f0 ("mtd: rawnand: Add NAND controller support on Intel LGM SoC")
Signed-off-by: default avatarMartin Blumenstingl <martin.blumenstingl@googlemail.com>
Signed-off-by: default avatarMiquel Raynal <miquel.raynal@bootlin.com>
Link: https://lore.kernel.org/linux-mtd/20210106140943.98072-1-martin.blumenstingl@googlemail.com
parent 3c97be69

drivers/mtd/nand/raw/intel-nand-controller.c

+3 −2
Original line number Diff line number Diff line
@@ -579,7 +579,7 @@ static int ebu_nand_probe(struct platform_device *pdev) 
	struct device *dev = &pdev->dev;

	struct ebu_nand_controller *ebu_host;

	struct nand_chip *nand;

	struct mtd_info *mtd = NULL;

	struct mtd_info *mtd;

	struct resource *res;

	char *resname;

	int ret;
@@ -647,12 +647,13 @@ static int ebu_nand_probe(struct platform_device *pdev) 
	       ebu_host->ebu + EBU_ADDR_SEL(cs));



	nand_set_flash_node(&ebu_host->chip, dev->of_node);



	mtd = nand_to_mtd(&ebu_host->chip);

	if (!mtd->name) {

		dev_err(ebu_host->dev, "NAND label property is mandatory\n");

		return -EINVAL;

	}



	mtd = nand_to_mtd(&ebu_host->chip);

	mtd->dev.parent = dev;

	ebu_host->dev = dev;