lkml.org 
[lkml]   [2014]   [Jul]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v6 04/23] mfd: max77686: Make platform data over-rule DT
    Date
    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>
    ---
    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


    \
     
     \ /
      Last update: 2014-07-04 12:41    [W:4.406 / U:0.024 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site