projects
/
firefly-linux-kernel-4.4.55.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
154409e
)
mfd: max77686: Make platform data over-rule DT
author
Javier Martinez Canillas
<javier.martinez@collabora.co.uk>
Fri, 4 Jul 2014 20:24:07 +0000
(22:24 +0200)
committer
Lee Jones
<lee.jones@linaro.org>
Mon, 21 Jul 2014 15:54:28 +0000
(16:54 +0100)
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>
drivers/mfd/max77686.c
patch
|
blob
|
history
diff --git
a/drivers/mfd/max77686.c
b/drivers/mfd/max77686.c
index d1f9d0433b7a30ce6bd1ebf5e56be2c99e5c86d5..12d4c17ae1c0bfb97f9647651da7673e5f839c54 100644
(file)
--- 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) {