p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

regulator: tps6507x: Fix boot regression due to testing wrong init_data pointer 

A NULL init_data once incremented will lead to oops, fix it.

Fixes: f979c08f76 ("regulator: tps6507x: Convert to regulator core's simplified DT parsing code")
Reported-by: Sekhar Nori <nsekhar@ti.com>
Signed-off-by: Axel Lin <axel.lin@ingics.com>
Tested-by: Sekhar Nori <nsekhar@ti.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Axel Lin 2019-05-16 20:48:08 +08:00 committed by Mark Brown
parent 4982094451
commit 7d293f5645
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/regulator/tps6507x-regulator.c
View File

@ -403,12 +403,12 @@ static int tps6507x_pmic_probe(struct platform_device *pdev)
/* common for all regulators */ /* common for all regulators */
tps->mfd = tps6507x_dev; 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 */ /* Register the regulators */
tps->info[i] = info; 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 = struct tps6507x_reg_platform_data *data =
init_data->driver_data; init_data[i].driver_data;
info->defdcdc_default = data->defdcdc_default; info->defdcdc_default = data->defdcdc_default;
} }