Skip to content

Commit 5e3b6b8

Browse files
committed
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
2 parents e59bf42 + 7d293f5 commit 5e3b6b8

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

drivers/regulator/tps6507x-regulator.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -403,12 +403,12 @@ static int tps6507x_pmic_probe(struct platform_device *pdev)
403403
/* common for all regulators */
404404
tps->mfd = tps6507x_dev;
405405

406-
for (i = 0; i < TPS6507X_NUM_REGULATOR; i++, info++, init_data++) {
406+
for (i = 0; i < TPS6507X_NUM_REGULATOR; i++, info++) {
407407
/* Register the regulators */
408408
tps->info[i] = info;
409-
if (init_data && init_data->driver_data) {
409+
if (init_data && init_data[i].driver_data) {
410410
struct tps6507x_reg_platform_data *data =
411-
init_data->driver_data;
411+
init_data[i].driver_data;
412412
info->defdcdc_default = data->defdcdc_default;
413413
}
414414

0 commit comments

Comments
 (0)