Skip to content

Commit b910a91

Browse files
committed
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
2 parents be75b1b + 82a917c commit b910a91

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

drivers/regulator/core.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4310,7 +4310,7 @@ static int _regulator_resume_early(struct device *dev, void *data)
43104310

43114311
rstate = regulator_get_suspend_state(rdev, *state);
43124312
if (rstate == NULL)
4313-
return -EINVAL;
4313+
return 0;
43144314

43154315
mutex_lock(&rdev->mutex);
43164316

drivers/regulator/stm32-vrefbuf.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ static int stm32_vrefbuf_enable(struct regulator_dev *rdev)
5151
* arbitrary timeout.
5252
*/
5353
ret = readl_poll_timeout(priv->base + STM32_VREFBUF_CSR, val,
54-
!(val & STM32_VRR), 650, 10000);
54+
val & STM32_VRR, 650, 10000);
5555
if (ret) {
5656
dev_err(&rdev->dev, "stm32 vrefbuf timed out!\n");
5757
val = readl_relaxed(priv->base + STM32_VREFBUF_CSR);

0 commit comments

Comments
 (0)