summaryrefslogtreecommitdiffstats
path: root/drivers/regulator
diff options
context:
space:
mode:
authorPaweł Chmiel <pawel.mikolaj.chmiel@gmail.com>2018-04-27 18:02:59 +0200
committerMark Brown <broonie@kernel.org>2018-05-17 14:12:04 +0900
commitc1472737914fe5246a672fef6e85c9455de8473f (patch)
tree9f14644502ec59b7708c7cd50f2b385b1fec4ec6 /drivers/regulator
parentd2a66ddfe8acd91aca81af2ef39abd5813d5dc65 (diff)
downloadlinux-stable-c1472737914fe5246a672fef6e85c9455de8473f.tar.gz
linux-stable-c1472737914fe5246a672fef6e85c9455de8473f.tar.bz2
linux-stable-c1472737914fe5246a672fef6e85c9455de8473f.zip
regulator: max8998: Fix platform data retrieval.
Since the max8998 MFD driver supports instantiation by DT, platform data retrieval is handled in MFD probe and cell drivers should get use the pdata field of max8998_dev struct to obtain them. Fixes: ee999fb3f17f ("mfd: max8998: Add support for Device Tree") Signed-off-by: Paweł Chmiel <pawel.mikolaj.chmiel@gmail.com> Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'drivers/regulator')
-rw-r--r--drivers/regulator/max8998.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/regulator/max8998.c b/drivers/regulator/max8998.c
index 3027e7ce100b..6a2b61c012b5 100644
--- a/drivers/regulator/max8998.c
+++ b/drivers/regulator/max8998.c
@@ -309,8 +309,7 @@ static int max8998_set_voltage_buck_sel(struct regulator_dev *rdev,
unsigned selector)
{
struct max8998_data *max8998 = rdev_get_drvdata(rdev);
- struct max8998_platform_data *pdata =
- dev_get_platdata(max8998->iodev->dev);
+ struct max8998_platform_data *pdata = max8998->iodev->pdata;
struct i2c_client *i2c = max8998->iodev->i2c;
int buck = rdev_get_id(rdev);
int reg, shift = 0, mask, ret, j;