diff --git a/[refs] b/[refs] index 76fd395d9d49..e97f170728ef 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 247514344492a0cf602317d2089bab1301922624 +refs/heads/master: 073512336e6333ffcaabbb2b92f8e616db3a0789 diff --git a/trunk/drivers/regulator/core.c b/trunk/drivers/regulator/core.c index 603e39f81ce0..b97c4a256636 100644 --- a/trunk/drivers/regulator/core.c +++ b/trunk/drivers/regulator/core.c @@ -1836,8 +1836,12 @@ static int _regulator_do_set_voltage(struct regulator_dev *rdev, if (ret < 0) return ret; old_selector = ret; - delay = rdev->desc->ops->set_voltage_time_sel(rdev, + ret = rdev->desc->ops->set_voltage_time_sel(rdev, old_selector, selector); + if (ret < 0) + rdev_warn(rdev, "set_voltage_time_sel() failed: %d\n", ret); + else + delay = ret; } if (best_val != INT_MAX) {