Commit 1cd9ceaa authored by Michael Walle's avatar Michael Walle Committed by Miquel Raynal
Browse files

mtd: core: provide unique name for nvmem device, take two 



Commit c048b60d ("mtd: core: provide unique name for nvmem device")
tries to give the nvmem device a unique name, but fails badly if the mtd
device doesn't have a "struct device" associated with it, i.e. if
CONFIG_MTD_PARTITIONED_MASTER is not set. This will result in the name
"(null)-user-otp", which is not unique. It seems the best we can do is
to use the compatible name together with a unique identifier added by
the nvmem subsystem by using NVMEM_DEVID_AUTO.

Fixes: c048b60d ("mtd: core: provide unique name for nvmem device")
Cc: stable@vger.kernel.org
Signed-off-by: default avatarMichael Walle <michael@walle.cc>
Signed-off-by: default avatarMiquel Raynal <miquel.raynal@bootlin.com>
Link: https://lore.kernel.org/linux-mtd/20230308082021.870459-1-michael@walle.cc
parent fe15c26e

drivers/mtd/mtdcore.c

+2 −3
Original line number Original line Diff line number Diff line
@@ -888,8 +888,8 @@ static struct nvmem_device *mtd_otp_nvmem_register(struct mtd_info *mtd, 




	/* OTP nvmem will be registered on the physical device */

	/* OTP nvmem will be registered on the physical device */

	config.dev = mtd->dev.parent;

	config.dev = mtd->dev.parent;

	config.name = kasprintf(GFP_KERNEL, "%s-%s", dev_name(&mtd->dev), compatible);

	config.name = compatible;

	config.id = NVMEM_DEVID_NONE;

	config.id = NVMEM_DEVID_AUTO;

	config.owner = THIS_MODULE;

	config.owner = THIS_MODULE;

	config.type = NVMEM_TYPE_OTP;

	config.type = NVMEM_TYPE_OTP;

	config.root_only = true;

	config.root_only = true;
@@ -905,7 +905,6 @@ static struct nvmem_device *mtd_otp_nvmem_register(struct mtd_info *mtd, 
		nvmem = NULL;

		nvmem = NULL;





	of_node_put(np);

	of_node_put(np);

	kfree(config.name);





	return nvmem;

	return nvmem;

}

}