Merge tag 'upstream-4.9-rc1' of git://git.infradead.org/linux-ubifs

[cascardo/linux.git] / drivers / iio / adc / ad7266.c

diff --git a/drivers/iio/adc/ad7266.c b/drivers/iio/adc/ad7266.c
index c0f6a98..b8d5cfd 100644 (file)
--- a/drivers/iio/adc/ad7266.c
+++ b/drivers/iio/adc/ad7266.c
@@ -481,7 +481,7 @@ error_free_gpios:
        if (!st->fixed_addr)
                gpio_free_array(st->gpios, ARRAY_SIZE(st->gpios));
 error_disable_reg:
-       if (!IS_ERR_OR_NULL(st->reg))
+       if (!IS_ERR(st->reg))
                regulator_disable(st->reg);
 
        return ret;
@@ -496,7 +496,7 @@ static int ad7266_remove(struct spi_device *spi)
        iio_triggered_buffer_cleanup(indio_dev);
        if (!st->fixed_addr)
                gpio_free_array(st->gpios, ARRAY_SIZE(st->gpios));
-       if (!IS_ERR_OR_NULL(st->reg))
+       if (!IS_ERR(st->reg))
                regulator_disable(st->reg);
 
        return 0;