Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7d9d592c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'mtd/fixes-for-5.0-rc8' of git://git.infradead.org/linux-mtd 

Pull MTD fixes from Boris Brezillon:

 - Don't add a digit to MTD-backed nvmem device names

 - Make sure powernv flash names are unique

* tag 'mtd/fixes-for-5.0-rc8' of git://git.infradead.org/linux-mtd:
  mtd: powernv_flash: Fix device registration error
  mtd: Use mtd->name when registering nvmem device
parents 1f5a018c 3e35730d

drivers/mtd/devices/powernv_flash.c

+1 −1
Original line number Diff line number Diff line
@@ -212,7 +212,7 @@ static int powernv_flash_set_driver_info(struct device *dev, 
	 * Going to have to check what details I need to set and how to

	 * get them

	 */

	mtd->name = devm_kasprintf(dev, GFP_KERNEL, "%pOFn", dev->of_node);

	mtd->name = devm_kasprintf(dev, GFP_KERNEL, "%pOFP", dev->of_node);

	mtd->type = MTD_NORFLASH;

	mtd->flags = MTD_WRITEABLE;

	mtd->size = size;

drivers/mtd/mtdcore.c

+1 −0
Original line number Diff line number Diff line
@@ -507,6 +507,7 @@ static int mtd_nvmem_add(struct mtd_info *mtd) 
{

	struct nvmem_config config = {};



	config.id = -1;

	config.dev = &mtd->dev;

	config.name = mtd->name;

	config.owner = THIS_MODULE;