diff options
Diffstat (limited to 'drivers/mfd/mfd-core.c')
-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, | |||
125 | struct platform_device *pdev; | 125 | struct platform_device *pdev; |
126 | struct device_node *np = NULL; | 126 | struct device_node *np = NULL; |
127 | int ret = -ENOMEM; | 127 | int ret = -ENOMEM; |
128 | int platform_id; | ||
128 | int r; | 129 | int r; |
129 | 130 | ||
130 | pdev = platform_device_alloc(cell->name, id + cell->id); | 131 | if (id < 0) |
132 | platform_id = id; | ||
133 | else | ||
134 | platform_id = id + cell->id; | ||
135 | |||
136 | pdev = platform_device_alloc(cell->name, platform_id); | ||
131 | if (!pdev) | 137 | if (!pdev) |
132 | goto fail_alloc; | 138 | goto fail_alloc; |
133 | 139 | ||