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

[linux-2.6-block.git] / drivers / regulator / tps65090-regulator.c

diff --git a/drivers/regulator/tps65090-regulator.c b/drivers/regulator/tps65090-regulator.c
index 5e1a67ade71f91419228300fec28311559ea08f9..395f35dc8cdb61b76ba49b976637059345935955 100644 (file)
--- a/drivers/regulator/tps65090-regulator.c
+++ b/drivers/regulator/tps65090-regulator.c
@@ -312,7 +312,11 @@ static void tps65090_configure_regulator_config(
                        gpio_flag = GPIOF_OUT_INIT_HIGH;
 
                config->ena_gpio = tps_pdata->gpio;
+               config->ena_gpio_initialized = true;
                config->ena_gpio_flags = gpio_flag;
+       } else {
+               config->ena_gpio = -EINVAL;
+               config->ena_gpio_initialized = false;
        }
 }