diff options
| author | Peter Ujfalusi <peter.ujfalusi@ti.com> | 2013-01-16 14:53:54 +0100 |
|---|---|---|
| committer | Samuel Ortiz <sameo@linux.intel.com> | 2013-02-14 00:22:50 +0100 |
| commit | e581238f2817d8ca8948340a2bc26dd9504bb812 (patch) | |
| tree | 78197777c7d08b7d5134ffcdbdb94d30961faebb /drivers/mfd | |
| parent | 6dd810b5e6fa688010dcb6d386c61589e850aaaa (diff) | |
| download | linux-e581238f2817d8ca8948340a2bc26dd9504bb812.tar.gz linux-e581238f2817d8ca8948340a2bc26dd9504bb812.tar.xz | |
mfd: twl-core: Do not try to call legacy mfd add_children() when booted with DT
There is really no point to retry to add children devices in case the
of_platform_populate() fails.
We do not have any information provided via pdata in this case anyways.
Depending on the boot type (legacy or DT) only execute either one.
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'drivers/mfd')
| -rw-r--r-- | drivers/mfd/twl-core.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/mfd/twl-core.c b/drivers/mfd/twl-core.c index fbff8301dfca..86cca9e09380 100644 --- a/drivers/mfd/twl-core.c +++ b/drivers/mfd/twl-core.c @@ -1305,10 +1305,9 @@ twl_probe(struct i2c_client *client, const struct i2c_device_id *id) twl_i2c_write_u8(TWL4030_MODULE_INTBR, temp, REG_GPPUPDCTR1); } - status = -ENODEV; if (node) status = of_platform_populate(node, NULL, NULL, &client->dev); - if (status) + else status = add_children(pdata, irq_base, id->driver_data); fail: |