提交 ede04c61 编写于 作者: J Javier Martinez Canillas 提交者: Lee Jones

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: NJavier Martinez Canillas <javier.martinez@collabora.co.uk>
Signed-off-by: NLee Jones <lee.jones@linaro.org>
上级 154409e4
...@@ -124,7 +124,7 @@ static int max77686_i2c_probe(struct i2c_client *i2c, ...@@ -124,7 +124,7 @@ static int max77686_i2c_probe(struct i2c_client *i2c,
unsigned int data; unsigned int data;
int ret = 0; 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); pdata = max77686_i2c_parse_dt_pdata(&i2c->dev);
if (!pdata) { if (!pdata) {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册