summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2019-06-10 20:35:55 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2019-06-10 20:35:55 +0300
commit5e3b6b8ecc53ffec9472ce5468307061072a5ded (patch)
tree81b17253dde6409585ee48e34b3d3c7fbeb2408c /drivers
parente59bf4282c8b0abd27cc4d550e20ec5b85ccaa19 (diff)
parent7d293f56456120efa97c4e18250d86d2a05ad0bd (diff)
downloadlinux-5e3b6b8ecc53ffec9472ce5468307061072a5ded.tar.xz
Merge tag 'regulator-fix-v5.2-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator
Pull regulator fix from Mark Brown: "Just one driver specific fix here, for a boot regression introduced during some modernization work on the tps6507x driver" * tag 'regulator-fix-v5.2-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator: regulator: tps6507x: Fix boot regression due to testing wrong init_data pointer
Diffstat (limited to 'drivers')
-rw-r--r--drivers/regulator/tps6507x-regulator.c6
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;
}