diff options
| author | David S. Miller <davem@davemloft.net> | 2019-06-07 11:00:14 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-06-07 11:00:14 -0700 |
| commit | a6cdeeb16bff89c8486324f53577db058cbe81ba (patch) | |
| tree | de2d38e10f5768bdf1d2902112a4803d0ae767f3 /drivers/iio/adc/npcm_adc.c | |
| parent | 96524ea4be04683bb3ad8ebaedcbe3a6e34302de (diff) | |
| parent | 1e1d926369545ea09c98c6c7f5d109aa4ee0cd0b (diff) | |
| download | linux-a6cdeeb16bff89c8486324f53577db058cbe81ba.tar.gz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Some ISDN files that got removed in net-next had some changes
done in mainline, take the removals.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/iio/adc/npcm_adc.c')
| -rw-r--r-- | drivers/iio/adc/npcm_adc.c | 2 |
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 { |