From: Axel Lin <axel.lin@ingics.com>
To: Jonathan Cameron <jic23@cam.ac.uk>
Cc: Michael Hennerich <hennerich@blackfin.uclinux.org>,
linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH 6/6] iio: dac: ad5791: Don't set error code to [pos|neg]_voltage_uv
Date: Fri, 14 Dec 2012 15:55:33 +0800 [thread overview]
Message-ID: <1355471733.11297.11.camel@phoenix> (raw)
In-Reply-To: <1355471245.11297.1.camel@phoenix>
regulator_get_voltage() may return negative error code.
Don't set error code to to pos_voltage_uv and neg_voltage_uv.
Signed-off-by: Axel Lin <axel.lin@ingics.com>
---
drivers/iio/dac/ad5791.c | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/drivers/iio/dac/ad5791.c b/drivers/iio/dac/ad5791.c
index 2bd2e37..6efe83e 100644
--- a/drivers/iio/dac/ad5791.c
+++ b/drivers/iio/dac/ad5791.c
@@ -365,7 +365,11 @@ static int __devinit ad5791_probe(struct spi_device *spi)
if (ret)
goto error_put_reg_pos;
- pos_voltage_uv = regulator_get_voltage(st->reg_vdd);
+ ret = regulator_get_voltage(st->reg_vdd);
+ if (ret < 0)
+ goto error_disable_reg_pos;
+
+ pos_voltage_uv = ret;
}
st->reg_vss = regulator_get(&spi->dev, "vss");
@@ -374,7 +378,11 @@ static int __devinit ad5791_probe(struct spi_device *spi)
if (ret)
goto error_put_reg_neg;
- neg_voltage_uv = regulator_get_voltage(st->reg_vss);
+ ret = regulator_get_voltage(st->reg_vss);
+ if (ret < 0)
+ goto error_disable_reg_neg;
+
+ neg_voltage_uv = ret;
}
st->pwr_down = true;
@@ -428,6 +436,7 @@ error_put_reg_neg:
if (!IS_ERR(st->reg_vss))
regulator_put(st->reg_vss);
+error_disable_reg_pos:
if (!IS_ERR(st->reg_vdd))
regulator_disable(st->reg_vdd);
error_put_reg_pos:
--
1.7.9.5
next prev parent reply other threads:[~2012-12-14 7:55 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-12-14 7:47 [PATCH 1/6] iio: adc: ad7266: Don't set error code to st->vref_uv Axel Lin
2012-12-14 7:48 ` [PATCH 2/6] iio: dac: ad5380: Don't set error code to st->vref Axel Lin
2012-12-14 7:51 ` [PATCH 3/6] iio: dac: ad5504: Don't set error code to voltage_uv Axel Lin
2012-12-14 7:52 ` [PATCH 4/6] iio: dac: ad5624r_spi: " Axel Lin
2012-12-14 7:54 ` [PATCH 5/6] iio: dac: ad5686: " Axel Lin
2012-12-14 7:55 ` Axel Lin [this message]
2012-12-14 9:56 ` [PATCH 1/6] iio: adc: ad7266: Don't set error code to st->vref_uv Lars-Peter Clausen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1355471733.11297.11.camel@phoenix \
--to=axel.lin@ingics.com \
--cc=hennerich@blackfin.uclinux.org \
--cc=jic23@cam.ac.uk \
--cc=linux-iio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).