提交 5e3b6b8e 编写于 作者: L Linus Torvalds

Merge tag 'regulator-fix-v5.2-rc4' of...

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
...@@ -403,12 +403,12 @@ static int tps6507x_pmic_probe(struct platform_device *pdev) ...@@ -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;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册