]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
regulator: act8865: set correct number of regulators in pdata
authorBeniamino Galvani <b.galvani@gmail.com>
Sat, 5 Jul 2014 13:20:53 +0000 (15:20 +0200)
committerMark Brown <broonie@linaro.org>
Tue, 5 Aug 2014 17:02:52 +0000 (18:02 +0100)
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>
drivers/regulator/act8865-regulator.c

index f07be3647985f5ac6e790ea844e9d4c58b6a9fec..52d1b6cad76f55ac8e2a6a8d4301d5820ae7cf1f 100644 (file)
@@ -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++) {