diff options
Diffstat (limited to 'drivers/regulator/vctrl-regulator.c')
| -rw-r--r-- | drivers/regulator/vctrl-regulator.c | 5 | 
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/regulator/vctrl-regulator.c b/drivers/regulator/vctrl-regulator.c index d2a37978fc3a..aac7be3b33f7 100644 --- a/drivers/regulator/vctrl-regulator.c +++ b/drivers/regulator/vctrl-regulator.c @@ -185,10 +185,7 @@ static int vctrl_set_voltage_sel(struct regulator_dev *rdev,  		unsigned int next_sel;  		int delay; -		if (selector >= vctrl->vtable[vctrl->sel].ovp_min_sel) -			next_sel = selector; -		else -			next_sel = vctrl->vtable[vctrl->sel].ovp_min_sel; +		next_sel = max_t(unsigned int, selector, vctrl->vtable[vctrl->sel].ovp_min_sel);  		ret = regulator_set_voltage_rdev(rdev->supply->rdev,  					    vctrl->vtable[next_sel].ctrl,  |