regulator: max77686: Consistently index opmode array by rdev id

[firefly-linux-kernel-4.4.55.git] / drivers / regulator / max77686.c

diff --git a/drivers/regulator/max77686.c b/drivers/regulator/max77686.c
index 09b0d8c20a9d0b6980a60f26df02c92c5cb397b4..27c5f455604479cba24fbfcfc9ebae9adff1912c 100644 (file)
--- 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,
                                                &regulators[i], &config);
                if (IS_ERR(rdev)) {