[PATCH v7 04/24] mfd: max77686: Make platform data over-rule DT
From: Javier Martinez Canillas <hidden>
Date: 2014-07-04 20:31:38
Also in:
linux-devicetree, linux-samsung-soc, lkml
Subsystem:
maxim pmic and muic drivers for exynos based boards, multifunction devices (mfd), the rest · Maintainers:
Chanwoo Choi, Krzysztof Kozlowski, Lee Jones, Linus Torvalds
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 <redacted> --- drivers/mfd/max77686.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/mfd/max77686.c b/drivers/mfd/max77686.c
index d1f9d04..12d4c17 100644
--- a/drivers/mfd/max77686.c
+++ b/drivers/mfd/max77686.c@@ -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) {
--
2.0.0.rc2