---

yaml --- r: 311255 b: refs/heads/master c: 8386a00 h: refs/heads/master i: 311253: 2e5cb32 311251: 74c600d 311247: e55b8e6 v: v3
git-mirror · Jun 20, 2012 · 064e5d0 · 064e5d0
1 parent 7c59bd2
commit 064e5d0
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6b57c0155cb78d15b0d93b2c7f66ad9536862476
+refs/heads/master: 8386a00f1443f676e8b614f654e2e324fdc0b3b3
diff --git a/trunk/drivers/regulator/tps6524x-regulator.c b/trunk/drivers/regulator/tps6524x-regulator.c
@@ -482,7 +482,7 @@ static int get_voltage_sel(struct regulator_dev *rdev)
 	info	= &supply_info[rdev_get_id(rdev)];
 
 	if (info->flags & FIXED_VOLTAGE)
-		return info->fixed_voltage;
+		return 0;
 
 	ret = read_field(hw, &info->voltage);
 	if (ret < 0)