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

[firefly-linux-kernel-4.4.55.git] / include / linux / regulator / consumer.h

diff --git a/include/linux/regulator/consumer.h b/include/linux/regulator/consumer.h
index 91aca11198d8fbd4ba9997dd78a733d0df5eedfa..27be915caa96465ebfe7068a3af499e976a0ddc1 100644 (file)
--- a/include/linux/regulator/consumer.h
+++ b/include/linux/regulator/consumer.h
@@ -394,8 +394,11 @@ static inline int regulator_count_voltages(struct regulator *regulator)
 static inline int regulator_set_voltage_tol(struct regulator *regulator,
                                            int new_uV, int tol_uV)
 {
-       return regulator_set_voltage(regulator,
-                                    new_uV - tol_uV, new_uV + tol_uV);
+       if (regulator_set_voltage(regulator, new_uV, new_uV + tol_uV) == 0)
+               return 0;
+       else
+               return regulator_set_voltage(regulator,
+                                            new_uV - tol_uV, new_uV + tol_uV);
 }
 
 static inline int regulator_is_supported_voltage_tol(struct regulator *regulator,