]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
iio:ad7266: Fix broken regulator error handling
authorMark Brown <broonie@kernel.org>
Mon, 20 Jun 2016 12:53:32 +0000 (13:53 +0100)
committerWilly Tarreau <w@1wt.eu>
Sat, 27 Aug 2016 09:40:26 +0000 (11:40 +0200)
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>
Cc: <Stable@vger.kernel.org>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
Signed-off-by: Willy Tarreau <w@1wt.eu>
drivers/iio/adc/ad7266.c

index c2744a75c3b09e541fba56a9bcd66bfb0f02f940..d08f4175938c3495412110e6edab174633ebccde 100644 (file)
@@ -406,7 +406,7 @@ static int ad7266_probe(struct spi_device *spi)
        st = iio_priv(indio_dev);
 
        st->reg = regulator_get(&spi->dev, "vref");
-       if (!IS_ERR_OR_NULL(st->reg)) {
+       if (!IS_ERR(st->reg)) {
                ret = regulator_enable(st->reg);
                if (ret)
                        goto error_put_reg;