From: Beniamino Galvani <b.galvani@gmail.com>
Date: Sat, 5 Jul 2014 13:20:53 +0000 (+0200)
Subject: regulator: act8865: set correct number of regulators in pdata
X-Git-Tag: v3.17-rc1~113^2~7^2
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=732714d0da4f3273e4b9a9dbe3e7556ea1188e36;p=karo-tx-linux.git

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>
---

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++) {