aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/regulator/s2mps11.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/regulator/s2mps11.c')
-rw-r--r--drivers/regulator/s2mps11.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/regulator/s2mps11.c b/drivers/regulator/s2mps11.c
index 738dc7763d47..b345cf51225a 100644
--- a/drivers/regulator/s2mps11.c
+++ b/drivers/regulator/s2mps11.c
@@ -940,7 +940,7 @@ static int s2mps11_pmic_probe(struct platform_device *pdev)
940 return -EINVAL; 940 return -EINVAL;
941 }; 941 };
942 942
943 s2mps11->ext_control_gpio = devm_kzalloc(&pdev->dev, 943 s2mps11->ext_control_gpio = devm_kmalloc(&pdev->dev,
944 sizeof(*s2mps11->ext_control_gpio) * s2mps11->rdev_num, 944 sizeof(*s2mps11->ext_control_gpio) * s2mps11->rdev_num,
945 GFP_KERNEL); 945 GFP_KERNEL);
946 if (!s2mps11->ext_control_gpio) 946 if (!s2mps11->ext_control_gpio)
@@ -981,6 +981,7 @@ common_reg:
981 config.regmap = iodev->regmap_pmic; 981 config.regmap = iodev->regmap_pmic;
982 config.driver_data = s2mps11; 982 config.driver_data = s2mps11;
983 config.ena_gpio_flags = GPIOF_OUT_INIT_HIGH; 983 config.ena_gpio_flags = GPIOF_OUT_INIT_HIGH;
984 config.ena_gpio_initialized = true;
984 for (i = 0; i < s2mps11->rdev_num; i++) { 985 for (i = 0; i < s2mps11->rdev_num; i++) {
985 struct regulator_dev *regulator; 986 struct regulator_dev *regulator;
986 987