diff options
| author | Mark Brown <broonie@linaro.org> | 2013-09-01 13:50:16 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-09-01 13:50:16 +0100 |
| commit | 6979380d85fd9e1ff701021206b315fcd66b510e (patch) | |
| tree | 8f230b8404cafdcfafba44bf97210c94ee963f92 /drivers/regulator/lp8755.c | |
| parent | 3aba952706c2f1e5f05987be0cda716ecf2b5d55 (diff) | |
| parent | d6c7e1139591b9ba7c4ad9c5eec748f0a68ad212 (diff) | |
Merge remote-tracking branch 'regulator/topic/max8660' into regulator-next
Diffstat (limited to 'drivers/regulator/lp8755.c')
| -rw-r--r-- | drivers/regulator/lp8755.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/regulator/lp8755.c b/drivers/regulator/lp8755.c index b37ef303e29f..785a25e9a437 100644 --- a/drivers/regulator/lp8755.c +++ b/drivers/regulator/lp8755.c @@ -450,7 +450,7 @@ static int lp8755_probe(struct i2c_client *client, { int ret, icnt; struct lp8755_chip *pchip; - struct lp8755_platform_data *pdata = client->dev.platform_data; + struct lp8755_platform_data *pdata = dev_get_platdata(&client->dev); if (!i2c_check_functionality(client->adapter, I2C_FUNC_I2C)) { dev_err(&client->dev, "i2c functionality check fail.\n"); |