summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2016-06-20 13:53:32 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-07-27 08:42:21 -0700
commit1ac9c884397b7caf2044fca8a64e337a87ccd060 (patch)
tree0daf605ded6c0dbd10a8447a4715f3db8967d82f
parent26b3c9975e2a6e456a98643e33a87458562f66ae (diff)
downloadlinux-stable-1ac9c884397b7caf2044fca8a64e337a87ccd060.tar.gz
linux-stable-1ac9c884397b7caf2044fca8a64e337a87ccd060.tar.bz2
linux-stable-1ac9c884397b7caf2044fca8a64e337a87ccd060.zip
iio:ad7266: Fix broken regulator error handling
commit 6b7f4e25f3309f106a5c7ff42c8231494cf285d3 upstream. 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> Signed-off-by: Jonathan Cameron <jic23@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-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;