Merge remote-tracking branch 'regulator/topic/change' into regulator-next

f3cd19c3 · Mark Brown · bfd9155e · 8a23b4e0 · f3cd19c3
Commit f3cd19c3 authored Dec 11, 2012 by Mark Brown
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

drivers/regulator/core.c drivers/regulator/core.c +1 -1

No files found.
--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@ -1886,7 +1886,7 @@ int regulator_can_change_voltage(struct regulator *regulator)

 	if (rdev->constraints &&
 	    rdev->constraints->valid_ops_mask & REGULATOR_CHANGE_VOLTAGE &&
-	    rdev->desc->n_voltages > 1)
+	    (rdev->desc->n_voltages - rdev->desc->linear_min_sel) > 1)
 		return 1;

 	return 0;