Merge tag 'regulator-fix-v5.2-rc4' of... (5e3b6b8e) · Commits · 戴 / test

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

drivers/regulator/tps6507x-regulator.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -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;
		}