Merge remote-tracking branch 'regulator/fix/fixed' into regulator-linus

mariux64 · Nov 24, 2013 · 7e9e801 · 7e9e801
2 parents c3fda06 + f446043
commit 7e9e801
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
@@ -2184,6 +2184,9 @@ int regulator_list_voltage(struct regulator *regulator, unsigned selector)
 	struct regulator_ops	*ops = rdev->desc->ops;
 	int			ret;
 
+	if (rdev->desc->fixed_uV && rdev->desc->n_voltages == 1 && !selector)
+		return rdev->desc->fixed_uV;
+
 	if (!ops->list_voltage || selector >= rdev->desc->n_voltages)
 		return -EINVAL;