iio: trigger: stm32-timer: fix get trigger mode

Fabrice Gasnier · jic23 · commit a359bb2a55f3 · 2017-08-20T15:21:47.000+01:00
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> Cc: <Stable@vger.kernel.org> Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
diff --git 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 = {

Original file line number	Diff line number	Diff line change
`@@ -485,7 +485,7 @@ static int stm32_get_trigger_mode(struct iio_dev *indio_dev,`
`485`	`485`
`486`	`486`	`regmap_read(priv->regmap, TIM_SMCR, &smcr);`
`487`	`487`
`488`		`- return smcr == TIM_SMCR_SMS ? 0 : -EINVAL;`
	`488`	`+ return (smcr & TIM_SMCR_SMS) == TIM_SMCR_SMS ? 0 : -EINVAL;`
`489`	`489`	`}`
`490`	`490`
`491`	`491`	`static const struct iio_enum stm32_trigger_mode_enum = {`