Commit e581238f authored Jan 16, 2013 by Peter Ujfalusi Committed by Samuel Ortiz Feb 14, 2013

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>

parent 6dd810b5

drivers/mfd/twl-core.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -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: