imrcpan/erofs-linux
1
0 Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git synced 2026-11-01 23:04:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

mfd: core: Fix platform-device id generation

Browse Source 
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 <[email protected]>
Signed-off-by: Lee Jones <[email protected]>
This commit is contained in:
Johan Hovold authored and Lee Jones committed 2014-11-25 16:18:43 +00:00
1 parent 16b5fe2966
commit 6e3f62f079
1 file changed
+7 -1
Download Patch File Download Diff File Expand all files Collapse all files
drivers/mfd/mfd-core.c
+7 -1
View File
@@ -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;