diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2019-02-20 09:16:11 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-02-20 09:16:11 -0800 |
| commit | 7d9d592caf8cc5d91f7923c5e717b69d0b1e246f (patch) | |
| tree | 2281d0a895cfde38a82dc23902f34368a4a46100 /drivers | |
| parent | Merge branch 'fixes-v5.1-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security (diff) | |
| parent | mtd: powernv_flash: Fix device registration error (diff) | |
| download | linux-dev-7d9d592caf8cc5d91f7923c5e717b69d0b1e246f.tar.xz linux-dev-7d9d592caf8cc5d91f7923c5e717b69d0b1e246f.zip | |
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
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/mtd/devices/powernv_flash.c | 2 | ||||
| -rw-r--r-- | drivers/mtd/mtdcore.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/drivers/mtd/devices/powernv_flash.c b/drivers/mtd/devices/powernv_flash.c index 22f753e555ac..83f88b8b5d9f 100644 --- a/drivers/mtd/devices/powernv_flash.c +++ b/drivers/mtd/devices/powernv_flash.c @@ -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; diff --git a/drivers/mtd/mtdcore.c b/drivers/mtd/mtdcore.c index 999b705769a8..3ef01baef9b6 100644 --- a/drivers/mtd/mtdcore.c +++ b/drivers/mtd/mtdcore.c @@ -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; |