diff options
| author | Krzysztof Kozlowski <k.kozlowski@samsung.com> | 2014-11-04 09:49:41 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2014-11-04 20:41:28 +0000 |
| commit | eca29da9a2e832936c9077b8e69adb4f4b22b0d5 (patch) | |
| tree | 302b334e339687b8182a7f76dfef0fd5ba61a807 /drivers/regulator | |
| parent | 78ce612860ce80edbec9171b4a786ce131a9631c (diff) | |
| download | linux-eca29da9a2e832936c9077b8e69adb4f4b22b0d5.tar.gz linux-eca29da9a2e832936c9077b8e69adb4f4b22b0d5.tar.bz2 linux-eca29da9a2e832936c9077b8e69adb4f4b22b0d5.zip | |
regulator: max77686: Consistently index opmode array by rdev id
Mixed indexes were used for array of opmodes in max77686_data structure:
id of regulator and index of regulator_desc array.
These indexes are exactly the same but the mixture may confuse. Use
consistently the id of regulator.
Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'drivers/regulator')
| -rw-r--r-- | drivers/regulator/max77686.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/regulator/max77686.c b/drivers/regulator/max77686.c index 09b0d8c20a9d..27c5f4556044 100644 --- a/drivers/regulator/max77686.c +++ b/drivers/regulator/max77686.c @@ -82,6 +82,7 @@ enum max77686_ramp_rate { }; struct max77686_data { + /* Array indexed by regulator id */ unsigned int opmode[MAX77686_REGULATORS]; }; @@ -513,12 +514,13 @@ static int max77686_pmic_probe(struct platform_device *pdev) for (i = 0; i < MAX77686_REGULATORS; i++) { struct regulator_dev *rdev; + int id = regulators[i].id; config.init_data = pdata->regulators[i].initdata; config.of_node = pdata->regulators[i].of_node; - max77686->opmode[i] = regulators[i].enable_mask >> - max77686_get_opmode_shift(i); + max77686->opmode[id] = regulators[i].enable_mask >> + max77686_get_opmode_shift(id); rdev = devm_regulator_register(&pdev->dev, ®ulators[i], &config); if (IS_ERR(rdev)) { |