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/lp872x.c | |
| parent | 3aba952706c2f1e5f05987be0cda716ecf2b5d55 (diff) | |
| parent | d6c7e1139591b9ba7c4ad9c5eec748f0a68ad212 (diff) | |
Merge remote-tracking branch 'regulator/topic/max8660' into regulator-next
Diffstat (limited to 'drivers/regulator/lp872x.c')
| -rw-r--r-- | drivers/regulator/lp872x.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/regulator/lp872x.c b/drivers/regulator/lp872x.c index 1018fb2020a9..2b84b727a3c4 100644 --- a/drivers/regulator/lp872x.c +++ b/drivers/regulator/lp872x.c @@ -962,7 +962,7 @@ static int lp872x_probe(struct i2c_client *cl, const struct i2c_device_id *id) } lp->dev = &cl->dev; - lp->pdata = cl->dev.platform_data; + lp->pdata = dev_get_platdata(&cl->dev); lp->chipid = id->driver_data; lp->num_regulators = num_regulators; i2c_set_clientdata(cl, lp); |