]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
iio:ad7266: Fix probe deferral for vref
authorMark Brown <broonie@kernel.org>
Mon, 20 Jun 2016 12:53:34 +0000 (13:53 +0100)
committerWilly Tarreau <w@1wt.eu>
Sat, 27 Aug 2016 09:40:26 +0000 (11:40 +0200)
commit 68b356eb3d9f5e38910fb62e22a78e2a18d544ae upstream.

Currently the ad7266 driver treats any failure to get vref as though the
regulator were not present but this means that if probe deferral is
triggered the driver will act as though the regulator were not present.
Instead only use the internal reference if we explicitly got -ENODEV which
is what is returned for absent regulators.

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 d08f4175938c3495412110e6edab174633ebccde..6569a4e2a43635b9f0dc5c98e0a4bd2a23008401 100644 (file)
@@ -417,6 +417,10 @@ static int ad7266_probe(struct spi_device *spi)
 
                st->vref_uv = ret;
        } else {
+               /* Any other error indicates that the regulator does exist */
+               if (PTR_ERR(st->reg) != -ENODEV)
+                       return PTR_ERR(st->reg);
+
                /* Use internal reference */
                st->vref_uv = 2500000;
        }