From: Keguang Zhang Date: Thu, 8 May 2025 03:28:42 +0000 (+0800) Subject: mtd: rawnand: loongson1: Fix inconsistent refcounting in ls1x_nand_chip_init() X-Git-Tag: v6.16-rc1~81^2^2~6 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=615f8f5077fc8d399818bda2a18bcc89debeb7a8;p=thirdparty%2Fkernel%2Flinux.git mtd: rawnand: loongson1: Fix inconsistent refcounting in ls1x_nand_chip_init() As reported by Dan, commit d2d10ede04b1 ("mtd: rawnand: Add Loongson-1 NAND Controller Driver"), leads to the following Smatch static checker warning: drivers/mtd/nand/raw/loongson1-nand-controller.c:730 ls1x_nand_chip_init() warn: inconsistent refcounting 'chip_np->kobj.kref.refcount.refs.counter': Fix this issue by calling of_node_put() immediately after using chip_np. In addition, remove all unnecessary of_node_put(chip_np) calls. Reported-by: Dan Carpenter Closes: https://lore.kernel.org/all/aBR535RZZT-sa6QZ@stanley.mountain/ Fixes: d2d10ede04b1 ("mtd: rawnand: Add Loongson-1 NAND Controller Driver") Signed-off-by: Keguang Zhang Signed-off-by: Miquel Raynal --- diff --git a/drivers/mtd/nand/raw/loongson1-nand-controller.c b/drivers/mtd/nand/raw/loongson1-nand-controller.c index 8754bb4f8b568..ef8e4f9ce2877 100644 --- a/drivers/mtd/nand/raw/loongson1-nand-controller.c +++ b/drivers/mtd/nand/raw/loongson1-nand-controller.c @@ -703,27 +703,25 @@ static int ls1x_nand_chip_init(struct ls1x_nand_host *host) if (!chip_np) return dev_err_probe(dev, -ENODEV, "failed to get child node for NAND chip\n"); - chip->controller = &host->controller; - chip->options = NAND_NO_SUBPAGE_WRITE | NAND_USES_DMA | NAND_BROKEN_XD; - chip->buf_align = 16; - nand_set_controller_data(chip, host); nand_set_flash_node(chip, chip_np); + of_node_put(chip_np); if (!mtd->name) return dev_err_probe(dev, -EINVAL, "Missing MTD label\n"); + nand_set_controller_data(chip, host); + chip->controller = &host->controller; + chip->options = NAND_NO_SUBPAGE_WRITE | NAND_USES_DMA | NAND_BROKEN_XD; + chip->buf_align = 16; mtd->dev.parent = dev; mtd->owner = THIS_MODULE; ret = nand_scan(chip, 1); - if (ret) { - of_node_put(chip_np); + if (ret) return dev_err_probe(dev, ret, "failed to scan NAND chip\n"); - } ret = mtd_device_register(mtd, NULL, 0); if (ret) { nand_cleanup(chip); - of_node_put(chip_np); return dev_err_probe(dev, ret, "failed to register MTD device\n"); }