regulator: core: Check for failed voltage sets before checking for delay

There is no need to consider waiting for the voltage to ramp if we
didn't manage to set it and looking at the return value is going to be
cheaper than is_enabled().

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
index 729b20d1c1de4afb39c103975f4227f2a5592555..890fa5eb770de3b0969c9897334e6d667b2f60f3 100644 (file)
--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@ -2143,7 +2143,7 @@ static int _regulator_do_set_voltage(struct regulator_dev *rdev,
                best_val = _regulator_get_voltage(rdev);
 
        /* Call set_voltage_time_sel if successfully obtained old_selector */
-       if (_regulator_is_enabled(rdev) && ret == 0 && old_selector >= 0 &&
+       if (ret == 0 && _regulator_is_enabled(rdev) && old_selector >= 0 &&
            rdev->desc->ops->set_voltage_time_sel) {
 
                delay = rdev->desc->ops->set_voltage_time_sel(rdev,