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

Unverified Commit 82a917c5 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branches 'regulator/fix/resume' and... 

Merge remote-tracking branches 'regulator/fix/resume' and 'regulator/fix/stm32-vfrefbuf' into regulator-linus
parents 661e50bc 35b5f14e f63248fa

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);