Merge tag 'driver-core-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-drm-fsl-dcu.git] / drivers / regulator / wm8994-regulator.c

diff --git a/drivers/regulator/wm8994-regulator.c b/drivers/regulator/wm8994-regulator.c
index fdfd37aefaf6d83ed11a87bac9586f1baf83b686..750e0bd61f9faaf78c2dc1e764bee70a5a118929 100644 (file)
--- a/drivers/regulator/wm8994-regulator.c
+++ b/drivers/regulator/wm8994-regulator.c
@@ -145,10 +145,12 @@ static int wm8994_ldo_probe(struct platform_device *pdev)
        config.driver_data = ldo;
        config.regmap = wm8994->regmap;
        config.init_data = &ldo->init_data;
-       if (pdata)
+       if (pdata) {
                config.ena_gpio = pdata->ldo[id].enable;
-       else if (wm8994->dev->of_node)
+       } else if (wm8994->dev->of_node) {
                config.ena_gpio = wm8994->pdata.ldo[id].enable;
+               config.ena_gpio_initialized = true;
+       }
 
        /* Use default constraints if none set up */
        if (!pdata || !pdata->ldo[id].init_data || wm8994->dev->of_node) {