Merge branch 'linux-4.9' of git://github.com/skeggsb/linux into drm-next

[karo-tx-linux.git] / drivers / iio / adc / ti-ads8688.c

diff --git a/drivers/iio/adc/ti-ads8688.c b/drivers/iio/adc/ti-ads8688.c
index c400439900afd611b9444c86b8f28031fef85c66..4a163496d9e45a13091a8618d9e4a6831706398c 100644 (file)
--- a/drivers/iio/adc/ti-ads8688.c
+++ b/drivers/iio/adc/ti-ads8688.c
@@ -438,7 +438,7 @@ static int ads8688_probe(struct spi_device *spi)
        return 0;
 
 error_out:
-       if (!IS_ERR_OR_NULL(st->reg))
+       if (!IS_ERR(st->reg))
                regulator_disable(st->reg);
 
        return ret;
@@ -451,7 +451,7 @@ static int ads8688_remove(struct spi_device *spi)
 
        iio_device_unregister(indio_dev);
 
-       if (!IS_ERR_OR_NULL(st->reg))
+       if (!IS_ERR(st->reg))
                regulator_disable(st->reg);
 
        return 0;