regulator: act8865: register all regulators regardless of how many are used

As Mark pointed out, the driver should register all regulators
regardless of how many are used in the system in order to aid diagnostics.

But in the previous patch, only register the regulators that are used.

Signed-off-by: Wenyou Yang <wenyou.yang@atmel.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
This commit is contained in:
Wenyou Yang 2013-12-31 09:27:52 +08:00 committed by Mark Brown
parent f1de2c2f27
commit d04b755273
1 changed files with 4 additions and 7 deletions

View File

@ -225,8 +225,8 @@ static int act8865_pdata_from_dt(struct device *dev,
return matched;
pdata->regulators = devm_kzalloc(dev,
sizeof(struct act8865_regulator_data) * matched,
GFP_KERNEL);
sizeof(struct act8865_regulator_data) *
ARRAY_SIZE(act8865_matches), GFP_KERNEL);
if (!pdata->regulators) {
dev_err(dev, "%s: failed to allocate act8865 registor\n",
__func__);
@ -236,10 +236,7 @@ static int act8865_pdata_from_dt(struct device *dev,
pdata->num_regulators = matched;
regulator = pdata->regulators;
for (i = 0; i < matched; i++) {
if (!act8865_matches[i].init_data)
continue;
for (i = 0; i < ARRAY_SIZE(act8865_matches); i++) {
regulator->id = i;
regulator->name = act8865_matches[i].name;
regulator->platform_data = act8865_matches[i].init_data;
@ -306,7 +303,7 @@ static int act8865_pmic_probe(struct i2c_client *client,
}
/* Finally register devices */
for (i = 0; i < pdata->num_regulators; i++) {
for (i = 0; i < ARRAY_SIZE(act8865_matches); i++) {
id = pdata->regulators[i].id;