* [PATCH] iio: trigger: stm32-timer: fix get trigger mode
@ 2017-08-03 9:22 Fabrice Gasnier
2017-08-09 14:41 ` Jonathan Cameron
0 siblings, 1 reply; 2+ messages in thread
From: Fabrice Gasnier @ 2017-08-03 9:22 UTC (permalink / raw)
To: linux-arm-kernel
Fix reading trigger mode, when other bit-fields are set. SMCR register
value must be masked to read SMS (slave mode selection) only.
Fixes: 9eba381 ("iio: make stm32 trigger driver use
INDIO_HARDWARE_TRIGGERED mode")
Signed-off-by: Fabrice Gasnier <fabrice.gasnier@st.com>
---
drivers/iio/trigger/stm32-timer-trigger.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/iio/trigger/stm32-timer-trigger.c b/drivers/iio/trigger/stm32-timer-trigger.c
index 14e6eb0..25ad6ab 100644
--- a/drivers/iio/trigger/stm32-timer-trigger.c
+++ b/drivers/iio/trigger/stm32-timer-trigger.c
@@ -485,7 +485,7 @@ static int stm32_get_trigger_mode(struct iio_dev *indio_dev,
regmap_read(priv->regmap, TIM_SMCR, &smcr);
- return smcr == TIM_SMCR_SMS ? 0 : -EINVAL;
+ return (smcr & TIM_SMCR_SMS) == TIM_SMCR_SMS ? 0 : -EINVAL;
}
static const struct iio_enum stm32_trigger_mode_enum = {
--
1.9.1
^ permalink raw reply related [flat|nested] 2+ messages in thread* [PATCH] iio: trigger: stm32-timer: fix get trigger mode
2017-08-03 9:22 [PATCH] iio: trigger: stm32-timer: fix get trigger mode Fabrice Gasnier
@ 2017-08-09 14:41 ` Jonathan Cameron
0 siblings, 0 replies; 2+ messages in thread
From: Jonathan Cameron @ 2017-08-09 14:41 UTC (permalink / raw)
To: linux-arm-kernel
On Thu, 3 Aug 2017 11:22:17 +0200
Fabrice Gasnier <fabrice.gasnier@st.com> wrote:
> Fix reading trigger mode, when other bit-fields are set. SMCR register
> value must be masked to read SMS (slave mode selection) only.
>
> Fixes: 9eba381 ("iio: make stm32 trigger driver use
> INDIO_HARDWARE_TRIGGERED mode")
>
> Signed-off-by: Fabrice Gasnier <fabrice.gasnier@st.com>
Applied to the fixes-togreg branch of iio.git.
THanks,
Jonathan
> ---
> drivers/iio/trigger/stm32-timer-trigger.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/iio/trigger/stm32-timer-trigger.c b/drivers/iio/trigger/stm32-timer-trigger.c
> index 14e6eb0..25ad6ab 100644
> --- a/drivers/iio/trigger/stm32-timer-trigger.c
> +++ b/drivers/iio/trigger/stm32-timer-trigger.c
> @@ -485,7 +485,7 @@ static int stm32_get_trigger_mode(struct iio_dev *indio_dev,
>
> regmap_read(priv->regmap, TIM_SMCR, &smcr);
>
> - return smcr == TIM_SMCR_SMS ? 0 : -EINVAL;
> + return (smcr & TIM_SMCR_SMS) == TIM_SMCR_SMS ? 0 : -EINVAL;
> }
>
> static const struct iio_enum stm32_trigger_mode_enum = {
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-08-09 14:41 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-08-03 9:22 [PATCH] iio: trigger: stm32-timer: fix get trigger mode Fabrice Gasnier
2017-08-09 14:41 ` Jonathan Cameron
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).