---

yaml --- r: 292044 b: refs/heads/master c: 1c37f8a h: refs/heads/master v: v3
git-mirror · Mar 11, 2012 · 0ba5d6e · 0ba5d6e
1 parent 04ee622
commit 0ba5d6e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ab353c2375258fced2967dfe66ff109098797cf1
+refs/heads/master: 1c37f8a838fa8b1e98a984893bd4f1a8a9849421
diff --git a/trunk/drivers/regulator/fixed.c b/trunk/drivers/regulator/fixed.c
@@ -192,7 +192,9 @@ static int __devinit reg_fixed_voltage_probe(struct platform_device *pdev)
 	drvdata->desc.type = REGULATOR_VOLTAGE;
 	drvdata->desc.owner = THIS_MODULE;
 	drvdata->desc.ops = &fixed_voltage_ops;
-	drvdata->desc.n_voltages = 1;
+
+	if (config->microvolts)
+		drvdata->desc.n_voltages = 1;
 
 	drvdata->microvolts = config->microvolts;
 	drvdata->gpio = config->gpio;