From mboxrd@z Thu Jan 1 00:00:00 1970 From: lee.jones@linaro.org (Lee Jones) Date: Fri, 18 Jul 2014 09:17:59 +0100 Subject: [PATCH v7 04/24] mfd: max77686: Make platform data over-rule DT In-Reply-To: <1404505467-26526-5-git-send-email-javier.martinez@collabora.co.uk> References: <1404505467-26526-1-git-send-email-javier.martinez@collabora.co.uk> <1404505467-26526-5-git-send-email-javier.martinez@collabora.co.uk> Message-ID: <20140718081759.GN30888@lee--X1> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On Fri, 04 Jul 2014, Javier Martinez Canillas wrote: > 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 > --- > drivers/mfd/max77686.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Applied now, thanks. > 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) { -- Lee Jones Linaro STMicroelectronics Landing Team Lead Linaro.org ? Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog