2019-04-07 08:23:13

by Tomer Maimon

Subject: [PATCH v1] iio: adc: modify NPCM ADC read reference voltage

Checking if regulator is valid before reading
NPCM ADC regulator voltage to avoid system crash
in a case the regulator is not valid.

Signed-off-by: Tomer Maimon <[email protected]>
---
drivers/iio/adc/npcm_adc.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/iio/adc/npcm_adc.c b/drivers/iio/adc/npcm_adc.c
index 9e25bbec9c70..193b3b81de4d 100644
--- a/drivers/iio/adc/npcm_adc.c
+++ b/drivers/iio/adc/npcm_adc.c
@@ -149,7 +149,7 @@ static int npcm_adc_read_raw(struct iio_dev *indio_dev,
}
return IIO_VAL_INT;
case IIO_CHAN_INFO_SCALE:
- if (info->vref) {
+ if (!IS_ERR(info->vref)) {
vref_uv = regulator_get_voltage(info->vref);
*val = vref_uv / 1000;
} else {
--
2.14.1

2019-04-07 10:29:05

by Jonathan Cameron

Subject: Re: [PATCH v1] iio: adc: modify NPCM ADC read reference voltage

On Sun, 7 Apr 2019 11:19:28 +0300
Tomer Maimon <[email protected]> wrote:

> Checking if regulator is valid before reading
> NPCM ADC regulator voltage to avoid system crash
> in a case the regulator is not valid.
>
> Signed-off-by: Tomer Maimon <[email protected]>
Good catch.

Applied to the fixes-togreg branch of iio.git and marked for
stable.

Thanks,

Jonathan

> ---
> drivers/iio/adc/npcm_adc.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/iio/adc/npcm_adc.c b/drivers/iio/adc/npcm_adc.c
> index 9e25bbec9c70..193b3b81de4d 100644
> --- a/drivers/iio/adc/npcm_adc.c
> +++ b/drivers/iio/adc/npcm_adc.c
> @@ -149,7 +149,7 @@ static int npcm_adc_read_raw(struct iio_dev *indio_dev,
> }
> return IIO_VAL_INT;
> case IIO_CHAN_INFO_SCALE:
> - if (info->vref) {
> + if (!IS_ERR(info->vref)) {
> vref_uv = regulator_get_voltage(info->vref);
> *val = vref_uv / 1000;
> } else {