From 2e80b04312a0aed96a9d3c046d7ab55d8814cf2a Mon Sep 17 00:00:00 2001 From: Axel Lin Date: Fri, 14 Dec 2012 12:06:00 +0000 Subject: [PATCH] --- yaml --- r: 348715 b: refs/heads/master c: 0ce2fdaa97c6a8d84e9fce3d920a45a493145623 h: refs/heads/master i: 348713: 6a0a69d3ae2f28bc67c3f1d744d4ffc0948da45d 348711: c202c15b95bb063fedf836ae5d55811142849dfc v: v3 --- [refs] | 2 +- trunk/drivers/iio/dac/ad5504.c | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index d769eeda2d88..7e474506c2e7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7e2dcc69824288916b55f90cd6db4992a0d95374 +refs/heads/master: 0ce2fdaa97c6a8d84e9fce3d920a45a493145623 diff --git a/trunk/drivers/iio/dac/ad5504.c b/trunk/drivers/iio/dac/ad5504.c index 242bdc7d0044..7f7c026b9d8a 100644 --- a/trunk/drivers/iio/dac/ad5504.c +++ b/trunk/drivers/iio/dac/ad5504.c @@ -296,7 +296,11 @@ static int __devinit ad5504_probe(struct spi_device *spi) 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; } spi_set_drvdata(spi, indio_dev);