linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: jic23@kernel.org (Jonathan Cameron)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH] iio: trigger: stm32-timer: fix get trigger mode
Date: Wed, 9 Aug 2017 15:41:39 +0100	[thread overview]
Message-ID: <20170809154139.56259949@archlinux> (raw)
In-Reply-To: <1501752137-14534-1-git-send-email-fabrice.gasnier@st.com>

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 = {

      reply	other threads:[~2017-08-09 14:41 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-08-03  9:22 [PATCH] iio: trigger: stm32-timer: fix get trigger mode Fabrice Gasnier
2017-08-09 14:41 ` Jonathan Cameron [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20170809154139.56259949@archlinux \
    --to=jic23@kernel.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).