Merge tag 'drivers2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[firefly-linux-kernel-4.4.55.git] / drivers / regulator / fixed.c

diff --git a/drivers/regulator/fixed.c b/drivers/regulator/fixed.c
index e24e3a174c4b343b0dfbf32a52d69dceee60fb10..40f38030b394d3d99418a195e92417fc61b04e8b 100644 (file)
--- 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)
        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;