From f16b8c1deb1c63c5241df0698213cc1dc6115e47 Mon Sep 17 00:00:00 2001
From: Marek Szyprowski <m.szyprowski@samsung.com>
Date: Thu, 9 Aug 2012 16:33:00 +0200
Subject: [PATCH] --- yaml --- r: 321855 b: refs/heads/master c:
 b2a1ef473b031b630a26685c91a46b9ae668d35c h: refs/heads/master i:   321853:
 0fdee6bd0f6c1d0f46355ae757ffdc2c6a666d44   321851:
 caf48ab45af2981f018b551dddb961472445c68f   321847:
 b5c01470d46baeb698498391df520418472b3446   321839:
 0f1214992b6adb88576791c96be3cfba744dcdcb   321823:
 08f8d65a3b0b62be9f74ae709abbbf159b7b8cbb   321791:
 48e00967010bc98acca56c4fca3f8756327afb9e v: v3

---
 [refs]                         | 2 +-
 trunk/drivers/regulator/core.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 4f52e2041eda..8a2a467625e9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e76ab829cc2d8b6350a3f01fffb208df4d7d8c1b
+refs/heads/master: b2a1ef473b031b630a26685c91a46b9ae668d35c
diff --git a/trunk/drivers/regulator/core.c b/trunk/drivers/regulator/core.c
index f092588a078c..48385318175a 100644
--- a/trunk/drivers/regulator/core.c
+++ b/trunk/drivers/regulator/core.c
@@ -3217,7 +3217,7 @@ regulator_register(const struct regulator_desc *regulator_desc,
 
 	dev_set_drvdata(&rdev->dev, rdev);
 
-	if (config->ena_gpio) {
+	if (config->ena_gpio && gpio_is_valid(config->ena_gpio)) {
 		ret = gpio_request_one(config->ena_gpio,
 				       GPIOF_DIR_OUT | config->ena_gpio_flags,
 				       rdev_get_name(rdev));