Commit c5bf33d7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'regulator-fix-v6.17-merge-window' of... 

Merge tag 'regulator-fix-v6.17-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator

Pull regulator fix from Mark Brown:
 "This fixes an issue with the newly added code for handling large
  voltage changes on regulators which require that individual voltage
  changes cover a limited range, the check for convergence was broken"

* tag 'regulator-fix-v6.17-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator:
  regulator: core: correct convergence check in regulator_set_voltage()
parents 21a1f198 10dfd36f

drivers/regulator/core.c

+1 −1
Original line number Diff line number Diff line
@@ -3884,7 +3884,7 @@ static int regulator_set_voltage_unlocked(struct regulator *regulator, 
			new_delta = ret;



			/* check that voltage is converging quickly enough */

			if (new_delta - delta > rdev->constraints->max_uV_step) {

			if (delta - new_delta < rdev->constraints->max_uV_step) {

				ret = -EWOULDBLOCK;

				goto out;

			}