Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1702832 > unrolled thread
| Started by | Fabrice Gasnier <fabrice.gasnier@st.com> |
|---|---|
| First post | 2017-08-03 11:30 +0200 |
| Last post | 2017-08-09 16:50 +0200 |
| Articles | 2 — 2 participants |
Back to article view | Back to linux.kernel
[PATCH] iio: trigger: stm32-timer: fix get trigger mode Fabrice Gasnier <fabrice.gasnier@st.com> - 2017-08-03 11:30 +0200
Re: [PATCH] iio: trigger: stm32-timer: fix get trigger mode Jonathan Cameron <jic23@kernel.org> - 2017-08-09 16:50 +0200
| From | Fabrice Gasnier <fabrice.gasnier@st.com> |
|---|---|
| Date | 2017-08-03 11:30 +0200 |
| Subject | [PATCH] iio: trigger: stm32-timer: fix get trigger mode |
| Message-ID | <uakC7-6qh-35@gated-at.bofh.it> |
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
[toc] | [next] | [standalone]
| From | Jonathan Cameron <jic23@kernel.org> |
|---|---|
| Date | 2017-08-09 16:50 +0200 |
| Message-ID | <ucAt5-fu-35@gated-at.bofh.it> |
| In reply to | #1702832 |
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 = {
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web