summaryrefslogtreecommitdiffstats
path: root/drivers/regulator/act8865-regulator.c
diff options
context:
space:
mode:
authorBeniamino Galvani <b.galvani@gmail.com>2014-07-05 15:20:53 +0200
committerMark Brown <broonie@linaro.org>2014-08-05 18:02:52 +0100
commitbbb83f38a8b0702f1b333aef1e8a3aa14068cdc7 (patch)
tree2ab588d9afa6b088528055c3fb9217dfd36c0a64 /drivers/regulator/act8865-regulator.c
parent40d3bc19667337d4cbad0075d048261fcbe39117 (diff)
downloadop-kernel-dev-bbb83f38a8b0702f1b333aef1e8a3aa14068cdc7.zip
op-kernel-dev-bbb83f38a8b0702f1b333aef1e8a3aa14068cdc7.tar.gz
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/act8865-regulator.c')
-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 f07be36..52d1b6c 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++) {
OpenPOWER on IntegriCloud