diff options
| author | Ingo Molnar <mingo@kernel.org> | 2018-03-19 20:37:35 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2018-03-19 20:37:35 +0100 |
| commit | 134933e55789ece9bca973d3502c7b8f7a9dae86 (patch) | |
| tree | b1694310855e43acb5fceb8b2d55ec8cd713ccad /drivers/regulator/stm32-vrefbuf.c | |
| parent | 24868367cdcac447232ebcb2aa06e1bf91291586 (diff) | |
| parent | c698ca5278934c0ae32297a8725ced2e27585d7f (diff) | |
| download | linux-134933e55789ece9bca973d3502c7b8f7a9dae86.tar.gz linux-134933e55789ece9bca973d3502c7b8f7a9dae86.tar.bz2 linux-134933e55789ece9bca973d3502c7b8f7a9dae86.zip | |
Merge tag 'v4.16-rc6' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/regulator/stm32-vrefbuf.c')
| -rw-r--r-- | drivers/regulator/stm32-vrefbuf.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/regulator/stm32-vrefbuf.c b/drivers/regulator/stm32-vrefbuf.c index 72c8b3e1022b..e0a9c445ed67 100644 --- a/drivers/regulator/stm32-vrefbuf.c +++ b/drivers/regulator/stm32-vrefbuf.c @@ -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); |