summaryrefslogtreecommitdiff
path: root/drivers/regulator
diff options
context:
space:
mode:
authorBeniamino Galvani <b.galvani@gmail.com>2014-07-05 17:20:53 +0400
committerMark Brown <broonie@linaro.org>2014-07-07 14:32:31 +0400
commit732714d0da4f3273e4b9a9dbe3e7556ea1188e36 (patch)
treeb9b9a7772069485b2d4db367084e438634018d77 /drivers/regulator
parent7171511eaec5bf23fb06078f59784a3a0626b38f (diff)
downloadlinux-732714d0da4f3273e4b9a9dbe3e7556ea1188e36.tar.xz
regulator: act8865: set correct number of regulators in pdata
act8865_pdata_from_dt() populates the array pdata->regulators with all the regulators and then assigns the field init_data only for the ones actually found in the DT. The patch changes the value assigned to pdata->num_regulators to match the size of the array. Signed-off-by: Beniamino Galvani <b.galvani@gmail.com> Tested-by: Wenyou Yang <wenyou.yang@atmel.com> Reviewed-by: Axel Lin <axel.lin@ingics.com> Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'drivers/regulator')
-rw-r--r--drivers/regulator/act8865-regulator.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/regulator/act8865-regulator.c b/drivers/regulator/act8865-regulator.c
index b92d7dd01a18..89f9f0c0f64d 100644
--- a/drivers/regulator/act8865-regulator.c
+++ b/drivers/regulator/act8865-regulator.c
@@ -230,7 +230,7 @@ static int act8865_pdata_from_dt(struct device *dev,
if (!pdata->regulators)
return -ENOMEM;
- pdata->num_regulators = matched;
+ pdata->num_regulators = ARRAY_SIZE(act8865_matches);
regulator = pdata->regulators;
for (i = 0; i < ARRAY_SIZE(act8865_matches); i++) {