Commit 3ec69881 authored by Marc Dietrich's avatar Marc Dietrich Committed by Greg Kroah-Hartman

staging: nvec: specify a platform-device base id

commit 6e3f62f0 (mfd: core: Fix platform-device id generation) modified
the computation of the mfd cell id. Negative numbers forbit the specification
of cell ids as we do. Fix this for now by specifying a base of 0 instead. In
the long run, this may be changed to automatic cell ids (base -2).
Reported-by: default avatarMisha Komarovskiy <zombah@gmail.com>
Signed-off-by: default avatarMarc Dietrich <marvin24@gmx.de>
Signed-off-by: default avatarGreg Kroah-Hartman <greg@kroah.com>
parent 6e49557b
...@@ -85,23 +85,20 @@ static struct nvec_chip *nvec_power_handle; ...@@ -85,23 +85,20 @@ static struct nvec_chip *nvec_power_handle;
static const struct mfd_cell nvec_devices[] = { static const struct mfd_cell nvec_devices[] = {
{ {
.name = "nvec-kbd", .name = "nvec-kbd",
.id = 1,
}, },
{ {
.name = "nvec-mouse", .name = "nvec-mouse",
.id = 1,
}, },
{ {
.name = "nvec-power", .name = "nvec-power",
.id = 1, .id = 0,
}, },
{ {
.name = "nvec-power", .name = "nvec-power",
.id = 2, .id = 1,
}, },
{ {
.name = "nvec-paz00", .name = "nvec-paz00",
.id = 1,
}, },
}; };
...@@ -891,7 +888,7 @@ static int tegra_nvec_probe(struct platform_device *pdev) ...@@ -891,7 +888,7 @@ static int tegra_nvec_probe(struct platform_device *pdev)
nvec_msg_free(nvec, msg); nvec_msg_free(nvec, msg);
} }
ret = mfd_add_devices(nvec->dev, -1, nvec_devices, ret = mfd_add_devices(nvec->dev, 0, nvec_devices,
ARRAY_SIZE(nvec_devices), NULL, 0, NULL); ARRAY_SIZE(nvec_devices), NULL, 0, NULL);
if (ret) if (ret)
dev_err(nvec->dev, "error adding subdevices\n"); dev_err(nvec->dev, "error adding subdevices\n");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment