korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-09-22 12:44:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

mfd: wm8994: Set mfd id-base for regulator devs creation to avoid conflicts

Browse Source 
After commit: 6e3f62f079 ("mfd: core: Fix platform-device id generation")
We must set the id base when register a duplicate name of mfd_cell.
If not, duplicate filename error was reported.

- sysfs: cannot create duplicate filename '/devices/.../wm8994-ldo'

Signed-off-by: Inha Song <ideal.song@samsung.com>
Acked-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
This commit is contained in:
Inha Song 2015-01-08 10:04:33 +09:00 committed by Lee Jones
parent 3daa122d6b
commit fef22cb414
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/mfd/wm8994-core.c
View File

@ -36,12 +36,12 @@
static const struct mfd_cell wm8994_regulator_devs[] = { static const struct mfd_cell wm8994_regulator_devs[] = {
{ {
.name = "wm8994-ldo", .name = "wm8994-ldo",
.id = 1, .id = 0,
.pm_runtime_no_callbacks = true, .pm_runtime_no_callbacks = true,
}, },
{ {
.name = "wm8994-ldo", .name = "wm8994-ldo",
.id = 2, .id = 1,
.pm_runtime_no_callbacks = true, .pm_runtime_no_callbacks = true,
}, },
}; };
@ -344,7 +344,7 @@ static int wm8994_device_init(struct wm8994 *wm8994, int irq)
dev_set_drvdata(wm8994->dev, wm8994); dev_set_drvdata(wm8994->dev, wm8994);
/* Add the on-chip regulators first for bootstrapping */ /* Add the on-chip regulators first for bootstrapping */
ret = mfd_add_devices(wm8994->dev, -1, ret = mfd_add_devices(wm8994->dev, 0,
wm8994_regulator_devs, wm8994_regulator_devs,
ARRAY_SIZE(wm8994_regulator_devs), ARRAY_SIZE(wm8994_regulator_devs),
NULL, 0, NULL); NULL, 0, NULL);