summaryrefslogtreecommitdiffstats
path: root/drivers/iio
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@ingics.com>2012-12-14 13:08:00 +0100
committerJonathan Cameron <jic23@kernel.org>2012-12-27 12:00:22 +0100
commit359570ad3fcfcc3a3031b3a5e01bfb616233eca0 (patch)
tree3a0f820aa214f71b875f6583db356fad15011250 /drivers/iio
parentiio: dac: ad5624r_spi: Don't set error code to voltage_uv (diff)
downloadlinux-359570ad3fcfcc3a3031b3a5e01bfb616233eca0.tar.xz
linux-359570ad3fcfcc3a3031b3a5e01bfb616233eca0.zip
iio: dac: ad5686: 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> Acked-by: Lars-Peter Clausen <lars@metafoo.de> Signed-off-by: Jonathan Cameron <jic23@kernel.org>
Diffstat (limited to 'drivers/iio')
-rw-r--r--drivers/iio/dac/ad5686.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/iio/dac/ad5686.c b/drivers/iio/dac/ad5686.c
index bc92ff9309c2..01eb1d0e4e41 100644
--- a/drivers/iio/dac/ad5686.c
+++ b/drivers/iio/dac/ad5686.c
@@ -332,7 +332,11 @@ static int __devinit ad5686_probe(struct spi_device *spi)
if (ret)
goto error_put_reg;
- voltage_uv = regulator_get_voltage(st->reg);
+ ret = regulator_get_voltage(st->reg);
+ if (ret < 0)
+ goto error_disable_reg;
+
+ voltage_uv = ret;
}
st->chip_info =