openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branches 'regulator/fix/resume' and 'regulator/fix/stm32-vfrefbuf' into regulator-linus

This commit is contained in:
Mark Brown 2018-03-07 14:39:07 +00:00
parent 661e50bc85 35b5f14ec6 f63248fac5
commit 82a917c59f
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/regulator/core.c
View File

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

2
drivers/regulator/stm32-vrefbuf.c
View File

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