From ee00ad99824579e15c37cf2f7c305e3c86a9f22b Mon Sep 17 00:00:00 2001 From: Axel Lin Date: Fri, 14 Dec 2012 12:07:00 +0000 Subject: [PATCH] --- yaml --- r: 348716 b: refs/heads/master c: 8434e7856551015650f62afa48e8f9e9b4bf80f2 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/iio/dac/ad5624r_spi.c | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 7e474506c2e7..b65d219b184e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0ce2fdaa97c6a8d84e9fce3d920a45a493145623 +refs/heads/master: 8434e7856551015650f62afa48e8f9e9b4bf80f2 diff --git a/trunk/drivers/iio/dac/ad5624r_spi.c b/trunk/drivers/iio/dac/ad5624r_spi.c index 6a7d6a48cc6d..14ea3dbf4902 100644 --- a/trunk/drivers/iio/dac/ad5624r_spi.c +++ b/trunk/drivers/iio/dac/ad5624r_spi.c @@ -238,7 +238,11 @@ static int __devinit ad5624r_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; } spi_set_drvdata(spi, indio_dev);