From edf20b662ecb4ce5e16f35cf921c1e788608219b Mon Sep 17 00:00:00 2001
From: Axel Lin <axel.lin@gmail.com>
Date: Mon, 16 Apr 2012 18:44:23 +0800
Subject: [PATCH] --- yaml --- r: 302099 b: refs/heads/master c:
 854ccbaee7e48734936690a3fd4817c57e98aaad h: refs/heads/master i:   302097:
 e75c192aac078184e71046cd8d0e188ff223fbec   302095:
 1aca4ed733b20d2395bb1f27c0b9e4fbf4920916 v: v3

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

diff --git a/[refs] b/[refs]
index f54dbdbff530..8a96387229db 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8ac0e95d6467ced054565312ecdf0a55a5333c64
+refs/heads/master: 854ccbaee7e48734936690a3fd4817c57e98aaad
diff --git a/trunk/drivers/regulator/core.c b/trunk/drivers/regulator/core.c
index 5c0c975e5ac2..2f0d557a910d 100644
--- a/trunk/drivers/regulator/core.c
+++ b/trunk/drivers/regulator/core.c
@@ -2335,6 +2335,9 @@ int regulator_set_optimum_mode(struct regulator *regulator, int uA_load)
 	 */
 	ret = -EINVAL;
 
+	if (!rdev->desc->ops->set_mode)
+		goto out;
+
 	/* get output voltage */
 	output_uV = _regulator_get_voltage(rdev);
 	if (output_uV <= 0) {