regulator: TPS65910: Create an array for init data

Create an array of fixed size for the platform to pass regulator
initalization data through.

Passing an array of pointers to init data also allows more flexible
definition of init data as well as prevents reading past the end of the
array should the platform define an incorrectly sized array.

Signed-off-by: Kyle Manna <kyle.manna@fuel7.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

1 files changed, 10 insertions, 3 deletions

diff --git a/drivers/regulator/tps65910-regulator.c b/drivers/regulator/tps65910-regulator.c
index 44b4f22a7f9f..a620e25c85c4 100644
--- a/drivers/regulator/tps65910-regulator.c
+++ b/drivers/regulator/tps65910-regulator.c
@@ -861,8 +861,6 @@ static __devinit int tps65910_probe(struct platform_device *pdev)
         if (!pmic_plat_data)
                 return -EINVAL;
 
-        reg_data = pmic_plat_data->tps65910_pmic_init_data;
-
         pmic = kzalloc(sizeof(*pmic), GFP_KERNEL);
         if (!pmic)
                 return -ENOMEM;
@@ -913,7 +911,16 @@ static __devinit int tps65910_probe(struct platform_device *pdev)
                 goto err_free_info;
         }
 
-        for (i = 0; i < pmic->num_regulators; i++, info++, reg_data++) {
+        for (i = 0; i < pmic->num_regulators && i < TPS65910_NUM_REGS;
+                        i++, info++) {
+
+                reg_data = pmic_plat_data->tps65910_pmic_init_data[i];
+
+                /* Regulator API handles empty constraints but not NULL
+                 * constraints */
+                if (!reg_data)
+                        continue;
+
                 /* Register the regulators */
                 pmic->info[i] = info;