diff options
Diffstat (limited to 'drivers/regulator/arizona-micsupp.c')
-rw-r--r-- | drivers/regulator/arizona-micsupp.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/regulator/arizona-micsupp.c b/drivers/regulator/arizona-micsupp.c index ce9aca5f8ee7..c313ef4c3a2f 100644 --- a/drivers/regulator/arizona-micsupp.c +++ b/drivers/regulator/arizona-micsupp.c | |||
@@ -198,7 +198,8 @@ static const struct regulator_init_data arizona_micsupp_ext_default = { | |||
198 | }; | 198 | }; |
199 | 199 | ||
200 | static int arizona_micsupp_of_get_pdata(struct arizona *arizona, | 200 | static int arizona_micsupp_of_get_pdata(struct arizona *arizona, |
201 | struct regulator_config *config) | 201 | struct regulator_config *config, |
202 | const struct regulator_desc *desc) | ||
202 | { | 203 | { |
203 | struct arizona_pdata *pdata = &arizona->pdata; | 204 | struct arizona_pdata *pdata = &arizona->pdata; |
204 | struct arizona_micsupp *micsupp = config->driver_data; | 205 | struct arizona_micsupp *micsupp = config->driver_data; |
@@ -210,7 +211,7 @@ static int arizona_micsupp_of_get_pdata(struct arizona *arizona, | |||
210 | if (np) { | 211 | if (np) { |
211 | config->of_node = np; | 212 | config->of_node = np; |
212 | 213 | ||
213 | init_data = of_get_regulator_init_data(arizona->dev, np); | 214 | init_data = of_get_regulator_init_data(arizona->dev, np, desc); |
214 | 215 | ||
215 | if (init_data) { | 216 | if (init_data) { |
216 | init_data->consumer_supplies = &micsupp->supply; | 217 | init_data->consumer_supplies = &micsupp->supply; |
@@ -264,7 +265,8 @@ static int arizona_micsupp_probe(struct platform_device *pdev) | |||
264 | 265 | ||
265 | if (IS_ENABLED(CONFIG_OF)) { | 266 | if (IS_ENABLED(CONFIG_OF)) { |
266 | if (!dev_get_platdata(arizona->dev)) { | 267 | if (!dev_get_platdata(arizona->dev)) { |
267 | ret = arizona_micsupp_of_get_pdata(arizona, &config); | 268 | ret = arizona_micsupp_of_get_pdata(arizona, &config, |
269 | desc); | ||
268 | if (ret < 0) | 270 | if (ret < 0) |
269 | return ret; | 271 | return ret; |
270 | } | 272 | } |