diff options
| author | Javier Martinez Canillas <javier.martinez@collabora.co.uk> | 2014-07-04 22:24:07 +0200 |
|---|---|---|
| committer | Lee Jones <lee.jones@linaro.org> | 2014-07-21 16:54:28 +0100 |
| commit | ede04c61642c04e9ff30eebbe56583296d554586 (patch) | |
| tree | 27f460265d5f997a7ea98bb1a2de0aebfccc8442 /drivers/mfd/max77686.c | |
| parent | 154409e4502621022dd6c84a091da350bc80d265 (diff) | |
| download | linux-ede04c61642c04e9ff30eebbe56583296d554586.tar.gz linux-ede04c61642c04e9ff30eebbe56583296d554586.tar.bz2 linux-ede04c61642c04e9ff30eebbe56583296d554586.zip | |
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>
Diffstat (limited to 'drivers/mfd/max77686.c')
| -rw-r--r-- | drivers/mfd/max77686.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mfd/max77686.c b/drivers/mfd/max77686.c index d1f9d0433b7a..12d4c17ae1c0 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) { |