Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Upgrade to 4.4.50-rt62
[kvmfornfv.git]
/
kernel
/
drivers
/
iio
/
adc
/
ad7266.c
diff --git
a/kernel/drivers/iio/adc/ad7266.c
b/kernel/drivers/iio/adc/ad7266.c
index
21e19b6
..
2123f0a
100644
(file)
--- a/
kernel/drivers/iio/adc/ad7266.c
+++ b/
kernel/drivers/iio/adc/ad7266.c
@@
-396,8
+396,8
@@
static int ad7266_probe(struct spi_device *spi)
st = iio_priv(indio_dev);
st = iio_priv(indio_dev);
- st->reg = devm_regulator_get(&spi->dev, "vref");
- if (!IS_ERR
_OR_NULL
(st->reg)) {
+ st->reg = devm_regulator_get
_optional
(&spi->dev, "vref");
+ if (!IS_ERR(st->reg)) {
ret = regulator_enable(st->reg);
if (ret)
return ret;
ret = regulator_enable(st->reg);
if (ret)
return ret;
@@
-408,6
+408,9
@@
static int ad7266_probe(struct spi_device *spi)
st->vref_mv = ret / 1000;
} else {
st->vref_mv = ret / 1000;
} 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_mv = 2500;
}
/* Use internal reference */
st->vref_mv = 2500;
}