Commit 3477acca authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branch 'opp/linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm 

Pull an OPP fix for 4.18-rc2 from Viresh Kumar.

* 'opp/linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm:
  PM / OPP: Update voltage in case freq == old_freq
parents ce397d21 c5c2a97b

drivers/opp/core.c

+1 −1
Original line number Diff line number Diff line
@@ -598,7 +598,7 @@ static int _generic_set_opp_regulator(const struct opp_table *opp_table, 
	}



	/* Scaling up? Scale voltage before frequency */

	if (freq > old_freq) {

	if (freq >= old_freq) {

		ret = _set_opp_voltage(dev, reg, new_supply);

		if (ret)

			goto restore_voltage;