Merge remote-tracking branches 'regulator/topic/rn5t618', 'regulator/topic/rpm',...

[firefly-linux-kernel-4.4.55.git] / drivers / regulator / s2mps11.c

diff --git a/drivers/regulator/s2mps11.c b/drivers/regulator/s2mps11.c
index adab82d5279f0696319f53d04e30b07615121dbb..2fa99a85853ff091bc5074c04f8cab31998362e0 100644 (file)
--- a/drivers/regulator/s2mps11.c
+++ b/drivers/regulator/s2mps11.c
@@ -845,7 +845,7 @@ static int s2mps11_pmic_probe(struct platform_device *pdev)
                return -EINVAL;
        };
 
-       s2mps11->ext_control_gpio = devm_kzalloc(&pdev->dev,
+       s2mps11->ext_control_gpio = devm_kmalloc(&pdev->dev,
                        sizeof(*s2mps11->ext_control_gpio) * s2mps11->rdev_num,
                        GFP_KERNEL);
        if (!s2mps11->ext_control_gpio)
@@ -886,6 +886,7 @@ common_reg:
        config.regmap = iodev->regmap_pmic;
        config.driver_data = s2mps11;
        config.ena_gpio_flags = GPIOF_OUT_INIT_HIGH;
+       config.ena_gpio_initialized = true;
        for (i = 0; i < s2mps11->rdev_num; i++) {
                struct regulator_dev *regulator;