Merge remote-tracking branches 'regulator/fix/resume' and 'regulator/fix/stm32-vfrefbuf' into regulator-linus
This commit is contained in:
commit
82a917c59f
|
@ -4310,7 +4310,7 @@ static int _regulator_resume_early(struct device *dev, void *data)
|
||||||
|
|
||||||
rstate = regulator_get_suspend_state(rdev, *state);
|
rstate = regulator_get_suspend_state(rdev, *state);
|
||||||
if (rstate == NULL)
|
if (rstate == NULL)
|
||||||
return -EINVAL;
|
return 0;
|
||||||
|
|
||||||
mutex_lock(&rdev->mutex);
|
mutex_lock(&rdev->mutex);
|
||||||
|
|
||||||
|
|
|
@ -51,7 +51,7 @@ static int stm32_vrefbuf_enable(struct regulator_dev *rdev)
|
||||||
* arbitrary timeout.
|
* arbitrary timeout.
|
||||||
*/
|
*/
|
||||||
ret = readl_poll_timeout(priv->base + STM32_VREFBUF_CSR, val,
|
ret = readl_poll_timeout(priv->base + STM32_VREFBUF_CSR, val,
|
||||||
!(val & STM32_VRR), 650, 10000);
|
val & STM32_VRR, 650, 10000);
|
||||||
if (ret) {
|
if (ret) {
|
||||||
dev_err(&rdev->dev, "stm32 vrefbuf timed out!\n");
|
dev_err(&rdev->dev, "stm32 vrefbuf timed out!\n");
|
||||||
val = readl_relaxed(priv->base + STM32_VREFBUF_CSR);
|
val = readl_relaxed(priv->base + STM32_VREFBUF_CSR);
|
||||||
|
|
Loading…
Reference in New Issue