From: Axel Lin <axel.lin@ingics.com>
Date: Sun, 4 Aug 2013 01:23:28 +0000 (+0800)
Subject: regulator: 88pm800: Fix checking whether num_regulator is valid
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=19c6b5440a66cba44365e511d9794e5e34ae2e4e;p=deliverable%2Flinux.git

regulator: 88pm800: Fix checking whether num_regulator is valid

The code to check whether num_regulator is valid is wrong because it should
iterate all array entries rather than break from the for loop if
pdata->regulators[i] is NULL.

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
---

diff --git a/drivers/regulator/88pm800.c b/drivers/regulator/88pm800.c
index b4c29b1c52a5..f42356552f21 100644
--- a/drivers/regulator/88pm800.c
+++ b/drivers/regulator/88pm800.c
@@ -299,10 +299,13 @@ static int pm800_regulator_probe(struct platform_device *pdev)
 			return -ENODEV;
 		}
 	} else if (pdata->num_regulators) {
-		/* Check whether num_regulator is valid. */
 		unsigned int count = 0;
-		for (i = 0; pdata->regulators[i]; i++)
-			count++;
+
+		/* Check whether num_regulator is valid. */
+		for (i = 0; ARRAY_SIZE(pdata->regulators); i++) {
+			if (pdata->regulators[i])
+				count++;
+		}
 		if (count != pdata->num_regulators)
 			return -EINVAL;
 	} else {