diff options
Diffstat (limited to 'drivers/regulator/s5m8767.c')
-rw-r--r-- | drivers/regulator/s5m8767.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/regulator/s5m8767.c b/drivers/regulator/s5m8767.c index 0ab5cbeeb797..dc1328c0c71c 100644 --- a/drivers/regulator/s5m8767.c +++ b/drivers/regulator/s5m8767.c | |||
@@ -581,7 +581,8 @@ static int s5m8767_pmic_dt_parse_pdata(struct platform_device *pdev, | |||
581 | 581 | ||
582 | rdata->id = i; | 582 | rdata->id = i; |
583 | rdata->initdata = of_get_regulator_init_data( | 583 | rdata->initdata = of_get_regulator_init_data( |
584 | &pdev->dev, reg_np); | 584 | &pdev->dev, reg_np, |
585 | ®ulators[i]); | ||
585 | rdata->reg_node = reg_np; | 586 | rdata->reg_node = reg_np; |
586 | rdata++; | 587 | rdata++; |
587 | rmode->id = i; | 588 | rmode->id = i; |
@@ -950,6 +951,7 @@ static int s5m8767_pmic_probe(struct platform_device *pdev) | |||
950 | config.of_node = pdata->regulators[i].reg_node; | 951 | config.of_node = pdata->regulators[i].reg_node; |
951 | config.ena_gpio = -EINVAL; | 952 | config.ena_gpio = -EINVAL; |
952 | config.ena_gpio_flags = 0; | 953 | config.ena_gpio_flags = 0; |
954 | config.ena_gpio_initialized = true; | ||
953 | if (gpio_is_valid(pdata->regulators[i].ext_control_gpio)) | 955 | if (gpio_is_valid(pdata->regulators[i].ext_control_gpio)) |
954 | s5m8767_regulator_config_ext_control(s5m8767, | 956 | s5m8767_regulator_config_ext_control(s5m8767, |
955 | &pdata->regulators[i], &config); | 957 | &pdata->regulators[i], &config); |