summaryrefslogtreecommitdiff
path: root/drivers/iio
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2016-06-20 15:53:32 +0300
committerJonathan Cameron <jic23@kernel.org>2016-06-26 19:38:27 +0300
commit6b7f4e25f3309f106a5c7ff42c8231494cf285d3 (patch)
tree2bbe53fa62729d5d6080e5383f232c370f512498 /drivers/iio
parent0c1f91b98552da49d9d8eed32b3132a58d2f4598 (diff)
downloadlinux-6b7f4e25f3309f106a5c7ff42c8231494cf285d3.tar.xz
iio:ad7266: Fix broken regulator error handling
All regulator_get() variants return either a pointer to a regulator or an ERR_PTR() so testing for NULL makes no sense and may lead to bugs if we use NULL as a valid regulator. Fix this by using IS_ERR() as expected. Signed-off-by: Mark Brown <broonie@kernel.org> Cc: <Stable@vger.kernel.org> Signed-off-by: Jonathan Cameron <jic23@kernel.org>
Diffstat (limited to 'drivers/iio')
-rw-r--r--drivers/iio/adc/ad7266.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/iio/adc/ad7266.c b/drivers/iio/adc/ad7266.c
index 21e19b60e2b9..835d45db258f 100644
--- a/drivers/iio/adc/ad7266.c
+++ b/drivers/iio/adc/ad7266.c
@@ -397,7 +397,7 @@ static int ad7266_probe(struct spi_device *spi)
st = iio_priv(indio_dev);
st->reg = devm_regulator_get(&spi->dev, "vref");
- if (!IS_ERR_OR_NULL(st->reg)) {
+ if (!IS_ERR(st->reg)) {
ret = regulator_enable(st->reg);
if (ret)
return ret;