summaryrefslogtreecommitdiffstats
path: root/drivers/iio
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@ingics.com>2012-12-18 03:33:00 +0000
committerJonathan Cameron <jic23@kernel.org>2012-12-27 11:00:27 +0000
commit13e57ee2056221296f1926d49d00edd224058bea (patch)
tree2504fdb8150915afb2775401cc1ae2d09e24651b /drivers/iio
parent359570ad3fcfcc3a3031b3a5e01bfb616233eca0 (diff)
downloadtalos-op-linux-13e57ee2056221296f1926d49d00edd224058bea.tar.gz
talos-op-linux-13e57ee2056221296f1926d49d00edd224058bea.zip
iio: dac: ad5446: Don't set error code to voltage_uv
regulator_get_voltage() may return negative error code. Add error checking to avoid setting error code to voltage_uv. Signed-off-by: Axel Lin <axel.lin@ingics.com> Signed-off-by: Jonathan Cameron <jic23@kernel.org>
Diffstat (limited to 'drivers/iio')
-rw-r--r--drivers/iio/dac/ad5446.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/iio/dac/ad5446.c b/drivers/iio/dac/ad5446.c
index 3310cbbd41e7..ecb639540dff 100644
--- a/drivers/iio/dac/ad5446.c
+++ b/drivers/iio/dac/ad5446.c
@@ -226,7 +226,11 @@ static int __devinit ad5446_probe(struct device *dev, const char *name,
if (ret)
goto error_put_reg;
- voltage_uv = regulator_get_voltage(reg);
+ ret = regulator_get_voltage(reg);
+ if (ret < 0)
+ goto error_disable_reg;
+
+ voltage_uv = ret;
}
indio_dev = iio_device_alloc(sizeof(*st));
OpenPOWER on IntegriCloud