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

…next
git-mirror · Dec 11, 2012 · f3cd19c · f3cd19c
2 parents bfd9155 + 8a23b4e
commit f3cd19c
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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;