diff options
| author |   Johan Hovold <johan@kernel.org> | 2014-09-26 12:55:33 +0200 |
|---|---|---|
| committer |   Lee Jones <lee.jones@linaro.org> | 2014-11-25 16:18:43 +0000 |
| commit | 6e3f62f0793ebff3f91076490ff0fbb107939701 (patch) | |
| tree | 403503551f4c2d3546858109201aa09172a2f777 /drivers/mfd | |
| parent | HID: hid-sensor-hub: Use mfd_add_hotplug_devices() helper (diff) | |
| download | linux-dev-6e3f62f0793ebff3f91076490ff0fbb107939701.tar.xz linux-dev-6e3f62f0793ebff3f91076490ff0fbb107939701.zip | |
mfd: core: Fix platform-device id generation
Make sure to always honour multi-function devices registered with
PLATFORM_DEVID_NONE (-1) or PLATFORM_DEVID_AUTO (-2) as id base. In this
case it does not make sense to append the cell id to the mfd-id base and
potentially change the requested behaviour.
Specifically this will allow multi-function devices to be registered
with PLATFORM_DEVID_AUTO while still having non-zero cell ids.
Signed-off-by: Johan Hovold <johan@kernel.org>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Diffstat (limited to 'drivers/mfd')
| -rw-r--r-- | drivers/mfd/mfd-core.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/mfd/mfd-core.c b/drivers/mfd/mfd-core.c index f3338fe9d069..2a87f69be53d 100644 --- a/drivers/mfd/mfd-core.c +++ b/drivers/mfd/mfd-core.c @@ -125,9 +125,15 @@ static int mfd_add_device(struct device *parent, int id, struct platform_device *pdev; struct device_node *np = NULL; int ret = -ENOMEM; + int platform_id; int r; - pdev = platform_device_alloc(cell->name, id + cell->id); + if (id < 0) + platform_id = id; + else + platform_id = id + cell->id; + + pdev = platform_device_alloc(cell->name, platform_id); if (!pdev) goto fail_alloc; |