summaryrefslogtreecommitdiff
path: root/drivers/iio
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2016-06-20 12:53:33 (GMT)
committerJonathan Cameron <jic23@kernel.org>2016-06-26 16:39:00 (GMT)
commite5511c816e5ac4909bdd38e85ac344e2b9b8e984 (patch)
treed8b15fc79864eb520a9477953414cb6960074448 /drivers/iio
parent6b7f4e25f3309f106a5c7ff42c8231494cf285d3 (diff)
downloadlinux-e5511c816e5ac4909bdd38e85ac344e2b9b8e984.tar.xz
iio:ad7266: Fix support for optional regulators
The ad7266 driver attempts to support deciding between the use of internal and external power supplies by checking to see if an error is returned when requesting the regulator. This doesn't work with the current code since the driver uses a normal regulator_get() which is for non-optional supplies and so assumes that if a regulator is not provided by the platform then this is a bug in the platform integration and so substitutes a dummy regulator. Use regulator_get_optional() instead which indicates to the framework that the regulator may be absent and provides a dummy regulator instead. Signed-off-by: Mark Brown <broonie@kernel.org> Cc: <Stable@vger.kernel.org> Signed-off-by: Jonathan Cameron <jic23@kernel.org>
Diffstat (limited to 'drivers/iio')
-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 835d45d..655b36b 100644
--- a/drivers/iio/adc/ad7266.c
+++ b/drivers/iio/adc/ad7266.c
@@ -396,7 +396,7 @@ static int ad7266_probe(struct spi_device *spi)
st = iio_priv(indio_dev);
- st->reg = devm_regulator_get(&spi->dev, "vref");
+ st->reg = devm_regulator_get_optional(&spi->dev, "vref");
if (!IS_ERR(st->reg)) {
ret = regulator_enable(st->reg);
if (ret)