Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]


Groups > linux.kernel > #1734279 > unrolled thread

[PATCH] iio: adc: stm32: fix bad error check on max_channels

Started byFabrice Gasnier <fabrice.gasnier@st.com>
First post2017-09-18 18:30 +0200
Last post2017-09-24 15:10 +0200
Articles 2 — 2 participants

Back to article view | Back to linux.kernel


Contents

  [PATCH] iio: adc: stm32: fix bad error check on max_channels Fabrice Gasnier <fabrice.gasnier@st.com> - 2017-09-18 18:30 +0200
    Re: [PATCH] iio: adc: stm32: fix bad error check on max_channels Jonathan Cameron <jic23@kernel.org> - 2017-09-24 15:10 +0200

#1734279 — [PATCH] iio: adc: stm32: fix bad error check on max_channels

FromFabrice Gasnier <fabrice.gasnier@st.com>
Date2017-09-18 18:30 +0200
Subject[PATCH] iio: adc: stm32: fix bad error check on max_channels
Message-ID<ur75L-b2-19@gated-at.bofh.it>
Fix a bad error check when counting 'st,adc-channels' array elements.
This is seen when all channels are in use simultaneously.

Signed-off-by: Fabrice Gasnier <fabrice.gasnier@st.com>
---
 drivers/iio/adc/stm32-adc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/iio/adc/stm32-adc.c b/drivers/iio/adc/stm32-adc.c
index e3c15f8..4df32cf 100644
--- a/drivers/iio/adc/stm32-adc.c
+++ b/drivers/iio/adc/stm32-adc.c
@@ -1666,7 +1666,7 @@ static int stm32_adc_chan_of_init(struct iio_dev *indio_dev)
 
 	num_channels = of_property_count_u32_elems(node, "st,adc-channels");
 	if (num_channels < 0 ||
-	    num_channels >= adc_info->max_channels) {
+	    num_channels > adc_info->max_channels) {
 		dev_err(&indio_dev->dev, "Bad st,adc-channels?\n");
 		return num_channels < 0 ? num_channels : -EINVAL;
 	}
-- 
1.9.1

[toc] | [next] | [standalone]


#1738181

FromJonathan Cameron <jic23@kernel.org>
Date2017-09-24 15:10 +0200
Message-ID<utePw-EY-15@gated-at.bofh.it>
In reply to#1734279
On Mon, 18 Sep 2017 18:24:15 +0200
Fabrice Gasnier <fabrice.gasnier@st.com> wrote:

> Fix a bad error check when counting 'st,adc-channels' array elements.
> This is seen when all channels are in use simultaneously.
> 
> Signed-off-by: Fabrice Gasnier <fabrice.gasnier@st.com>

Applied to fixes-togreg-post-rc1, fixes tag added and marked for
stable.

Jonathan

> ---
>  drivers/iio/adc/stm32-adc.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/iio/adc/stm32-adc.c b/drivers/iio/adc/stm32-adc.c
> index e3c15f8..4df32cf 100644
> --- a/drivers/iio/adc/stm32-adc.c
> +++ b/drivers/iio/adc/stm32-adc.c
> @@ -1666,7 +1666,7 @@ static int stm32_adc_chan_of_init(struct iio_dev *indio_dev)
>  
>  	num_channels = of_property_count_u32_elems(node, "st,adc-channels");
>  	if (num_channels < 0 ||
> -	    num_channels >= adc_info->max_channels) {
> +	    num_channels > adc_info->max_channels) {
>  		dev_err(&indio_dev->dev, "Bad st,adc-channels?\n");
>  		return num_channels < 0 ? num_channels : -EINVAL;
>  	}

[toc] | [prev] | [standalone]


Back to top | Article view | linux.kernel


csiph-web