From 7eb5376ec68741fa2a91d0cba8b57afa810f89ff Mon Sep 17 00:00:00 2001
From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Thu, 9 Aug 2012 16:42:19 +0100
Subject: [PATCH] --- yaml --- r: 323308 b: refs/heads/master c:
 f7df20ec323009bd2ea8e1c65f11bb43fd526c4f h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index c92d9e224e00..3ca6ad0233a5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 215b8b055de7dad26ab6c10f70130934309cb696
+refs/heads/master: f7df20ec323009bd2ea8e1c65f11bb43fd526c4f
diff --git a/trunk/drivers/regulator/core.c b/trunk/drivers/regulator/core.c
index 157def15ed78..ff8f54447305 100644
--- a/trunk/drivers/regulator/core.c
+++ b/trunk/drivers/regulator/core.c
@@ -2395,6 +2395,8 @@ static int _regulator_get_voltage(struct regulator_dev *rdev)
 		ret = rdev->desc->ops->list_voltage(rdev, sel);
 	} else if (rdev->desc->ops->get_voltage) {
 		ret = rdev->desc->ops->get_voltage(rdev);
+	} else if (rdev->desc->ops->list_voltage) {
+		ret = rdev->desc->ops->list_voltage(rdev, 0);
 	} else {
 		return -EINVAL;
 	}