aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/regulator/fixed.c
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2012-03-03 06:40:01 -0500
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-03-11 16:48:51 -0400
commit1c37f8a838fa8b1e98a984893bd4f1a8a9849421 (patch)
treebba5a8d8725227b01a742243c7592ac34ba821af /drivers/regulator/fixed.c
parentab353c2375258fced2967dfe66ff109098797cf1 (diff)
regulator fixed: Do not report enumaratable voltages if there are none
If used as a dummy voltage provider the fixed regulator should not set n_voltages to make the core accept the device. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'drivers/regulator/fixed.c')
-rw-r--r--drivers/regulator/fixed.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/regulator/fixed.c b/drivers/regulator/fixed.c
index e24e3a174c4b..40f38030b394 100644
--- a/drivers/regulator/fixed.c
+++ b/drivers/regulator/fixed.c
@@ -192,7 +192,9 @@ static int __devinit reg_fixed_voltage_probe(struct platform_device *pdev)
192 drvdata->desc.type = REGULATOR_VOLTAGE; 192 drvdata->desc.type = REGULATOR_VOLTAGE;
193 drvdata->desc.owner = THIS_MODULE; 193 drvdata->desc.owner = THIS_MODULE;
194 drvdata->desc.ops = &fixed_voltage_ops; 194 drvdata->desc.ops = &fixed_voltage_ops;
195 drvdata->desc.n_voltages = 1; 195
196 if (config->microvolts)
197 drvdata->desc.n_voltages = 1;
196 198
197 drvdata->microvolts = config->microvolts; 199 drvdata->microvolts = config->microvolts;
198 drvdata->gpio = config->gpio; 200 drvdata->gpio = config->gpio;