Commit ede04c61 authored Jul 04, 2014 by Javier Martinez Canillas Committed by Lee Jones Jul 21, 2014

mfd: max77686: Make platform data over-rule DT



The function max77802_i2c_parse_dt_pdata() should only be called
if there isn't already platform data for the device.

Signed-off-by: Javier Martinez Canillas <javier.martinez@collabora.co.uk>
Signed-off-by: Lee Jones <lee.jones@linaro.org>

parent 154409e4

drivers/mfd/max77686.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -124,7 +124,7 @@ static int max77686_i2c_probe(struct i2c_client *i2c,
		unsigned int data;
		int ret = 0;

		if (IS_ENABLED(CONFIG_OF) && i2c->dev.of_node)
		if (IS_ENABLED(CONFIG_OF) && i2c->dev.of_node && !pdata)
		pdata = max77686_i2c_parse_dt_pdata(&i2c->dev);

		if (!pdata) {