summaryrefslogtreecommitdiff
path: root/drivers/mtd/nand/raw/meson_nand.c
diff options
context:
space:
mode:
authorMiquel Raynal <miquel.raynal@bootlin.com>2023-11-04 13:50:22 +0300
committerMiquel Raynal <miquel.raynal@bootlin.com>2023-11-04 13:50:34 +0300
commit6d55d31e927eec68ba6db344688044ed253223e9 (patch)
treeeae4ad19d6d030185a0cb6b28ad80bb46b38f2db /drivers/mtd/nand/raw/meson_nand.c
parent3a8ab4a13d17f2a16cd4f125e5238096c1c55149 (diff)
parent5a985960a4dd041c21dbe9956958c1633d2da706 (diff)
downloadlinux-6d55d31e927eec68ba6db344688044ed253223e9.tar.xz
Merge tag 'nand/for-6.7' into mtd/next
The raw NAND subsystem has, as usual, seen a bit of cleanup being done this cycle, typically return values of platform_get_irq() and devm_kasprintf(), plus structure annotations for sanitizers. There is also a better ECC check in the Arasan driver. This comes with smaller misc changes. In the SPI-NAND world there is now support for Foresee F35SQA002G, Winbond W25N and XTX XT26 chips. Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
Diffstat (limited to 'drivers/mtd/nand/raw/meson_nand.c')
-rw-r--r--drivers/mtd/nand/raw/meson_nand.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/mtd/nand/raw/meson_nand.c b/drivers/mtd/nand/raw/meson_nand.c
index 378f28ce6a74..71ec4052e52a 100644
--- a/drivers/mtd/nand/raw/meson_nand.c
+++ b/drivers/mtd/nand/raw/meson_nand.c
@@ -1134,6 +1134,9 @@ static int meson_nfc_clk_init(struct meson_nfc *nfc)
init.name = devm_kasprintf(nfc->dev,
GFP_KERNEL, "%s#div",
dev_name(nfc->dev));
+ if (!init.name)
+ return -ENOMEM;
+
init.ops = &clk_divider_ops;
nfc_divider_parent_data[0].fw_name = "device";
init.parent_data = nfc_divider_parent_data;