Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

Merge tag 'regulator-fix-v4.16-rc4' of... 

Merge tag 'regulator-fix-v4.16-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator

Pull regulator fixes from Mark Brown:
 "A couple of fixes here:

   - another half of the supend to idle fix from Geert that went in
     earlier, both he and I are confused as to why he didn't notice that
     this was missing when his earlier fix was merged.

   - a simple fix for a test done the wrong way round in the
     stm32-vrefbuf driver"

* tag 'regulator-fix-v4.16-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator:
  regulator: Fix resume from suspend to idle
  regulator: stm32-vrefbuf: fix check on ready flag
parents be75b1b8 82a917c5

drivers/regulator/core.c

+1 −1
Original line number Diff line number Diff line
@@ -4310,7 +4310,7 @@ static int _regulator_resume_early(struct device *dev, void *data) 


	rstate = regulator_get_suspend_state(rdev, *state);

	if (rstate == NULL)

		return -EINVAL;

		return 0;



	mutex_lock(&rdev->mutex);

drivers/regulator/stm32-vrefbuf.c

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ static int stm32_vrefbuf_enable(struct regulator_dev *rdev) 
	 * arbitrary timeout.

	 */

	ret = readl_poll_timeout(priv->base + STM32_VREFBUF_CSR, val,

				 !(val & STM32_VRR), 650, 10000);

				 val & STM32_VRR, 650, 10000);

	if (ret) {

		dev_err(&rdev->dev, "stm32 vrefbuf timed out!\n");

		val = readl_relaxed(priv->base + STM32_VREFBUF_CSR);