summaryrefslogtreecommitdiff
path: root/drivers/iio
diff options
context:
space:
mode:
authorTomer Maimon <tmaimon77@gmail.com>2019-04-07 11:19:28 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-06-09 10:16:10 +0300
commitfb304841e95845ad131b6762ed2231c4302f8743 (patch)
tree03b25d604a39d4ef95d8518e60c2f506aa4b90ea /drivers/iio
parent6b84e38b700bf6c8f4e983ba1e6c01d8b16bf581 (diff)
downloadlinux-fb304841e95845ad131b6762ed2231c4302f8743.tar.xz
iio: adc: modify NPCM ADC read reference voltage
commit 4e63ed6b90803eeb400c392e9ff493200d926b06 upstream. 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 <tmaimon77@gmail.com> Cc: <Stable@vger.kernel.org> Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/iio')
-rw-r--r--drivers/iio/adc/npcm_adc.c2
1 files changed, 1 insertions, 1 deletions
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 {