summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@ingics.com>2012-12-14 12:08:00 +0000
committerJonathan Cameron <jic23@kernel.org>2012-12-27 11:00:22 +0000
commit359570ad3fcfcc3a3031b3a5e01bfb616233eca0 (patch)
tree3a0f820aa214f71b875f6583db356fad15011250
parent8434e7856551015650f62afa48e8f9e9b4bf80f2 (diff)
downloadop-kernel-dev-359570ad3fcfcc3a3031b3a5e01bfb616233eca0.zip
op-kernel-dev-359570ad3fcfcc3a3031b3a5e01bfb616233eca0.tar.gz
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>
-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 bc92ff9..01eb1d0 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 =
OpenPOWER on IntegriCloud