diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2019-06-22 12:07:35 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2019-06-22 12:07:35 +0200 |
| commit | 6808acb57a286cda48d8674713e672681ca7ffb3 (patch) | |
| tree | 77ca408d2453069f6caec40053c4a20e60594c32 /drivers/regulator/tps6507x-regulator.c | |
| parent | d21e43f2ef32ba3242687dbedb3c4b9a76b3eebc (diff) | |
| parent | 9e0babf2c06c73cda2c0cd37a1653d823adb40ec (diff) | |
| download | linux-6808acb57a286cda48d8674713e672681ca7ffb3.tar.bz2 | |
Merge branch 'linus' into timers/core
Pick up upstream fixes for pending changes.
Diffstat (limited to 'drivers/regulator/tps6507x-regulator.c')
| -rw-r--r-- | drivers/regulator/tps6507x-regulator.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/regulator/tps6507x-regulator.c b/drivers/regulator/tps6507x-regulator.c index a1b7fab91dd4..d2a8f69b2665 100644 --- a/drivers/regulator/tps6507x-regulator.c +++ b/drivers/regulator/tps6507x-regulator.c @@ -403,12 +403,12 @@ static int tps6507x_pmic_probe(struct platform_device *pdev) /* common for all regulators */ tps->mfd = tps6507x_dev; - for (i = 0; i < TPS6507X_NUM_REGULATOR; i++, info++, init_data++) { + for (i = 0; i < TPS6507X_NUM_REGULATOR; i++, info++) { /* Register the regulators */ tps->info[i] = info; - if (init_data && init_data->driver_data) { + if (init_data && init_data[i].driver_data) { struct tps6507x_reg_platform_data *data = - init_data->driver_data; + init_data[i].driver_data; info->defdcdc_default = data->defdcdc_default; } |