diff options
author | 2023-05-01 15:20:08 -0700 | |
---|---|---|
committer | 2023-05-01 15:20:08 -0700 | |
commit | 9a87ffc99ec8eb8d35eed7c4f816d75f5cc9662e (patch) | |
tree | d57f3a63479a07b4e0cece029886e76e04feb984 /drivers/pwm/pwm-stm32-lp.c | |
parent | Input: cyttsp5 - fix sensing configuration data structure (diff) | |
parent | Revert "Input: xpad - fix support for some third-party controllers" (diff) | |
download | wireguard-linux-9a87ffc99ec8eb8d35eed7c4f816d75f5cc9662e.tar.xz wireguard-linux-9a87ffc99ec8eb8d35eed7c4f816d75f5cc9662e.zip |
Merge branch 'next' into for-linus
Prepare input updates for 6.4 merge window.
Diffstat (limited to 'drivers/pwm/pwm-stm32-lp.c')
-rw-r--r-- | drivers/pwm/pwm-stm32-lp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pwm/pwm-stm32-lp.c b/drivers/pwm/pwm-stm32-lp.c index 514ff58a4471..f315fa106be8 100644 --- a/drivers/pwm/pwm-stm32-lp.c +++ b/drivers/pwm/pwm-stm32-lp.c @@ -127,7 +127,7 @@ static int stm32_pwm_lp_apply(struct pwm_chip *chip, struct pwm_device *pwm, /* ensure CMP & ARR registers are properly written */ ret = regmap_read_poll_timeout(priv->regmap, STM32_LPTIM_ISR, val, - (val & STM32_LPTIM_CMPOK_ARROK), + (val & STM32_LPTIM_CMPOK_ARROK) == STM32_LPTIM_CMPOK_ARROK, 100, 1000); if (ret) { dev_err(priv->chip.dev, "ARR/CMP registers write issue\n"); |