From: Axel Lin <axel.lin@gmail.com>
To: Mark Brown <broonie@opensource.wolfsonmicro.com>
Cc: Liam Girdwood <lrg@ti.com>, linux-kernel@vger.kernel.org
Subject: [PATCH 1/6] regulator: core: Add checking n_voltages if using list_voltage() to read voltage regulators
Date: Fri, 10 Aug 2012 09:32:33 +0800 [thread overview]
Message-ID: <1344562353.2996.1.camel@phoenix> (raw)
Use list_voltage() to read single voltage regulators should be only applied to
single voltage regulators, thus add checking n_voltages for this case.
Signed-off-by: Axel Lin <axel.lin@gmail.com>
---
drivers/regulator/core.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
index 0fffeae..5469f9f 100644
--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@ -2395,7 +2395,8 @@ static int _regulator_get_voltage(struct regulator_dev *rdev)
ret = rdev->desc->ops->list_voltage(rdev, sel);
} else if (rdev->desc->ops->get_voltage) {
ret = rdev->desc->ops->get_voltage(rdev);
- } else if (rdev->desc->ops->list_voltage) {
+ } else if (rdev->desc->ops->list_voltage &&
+ (rdev->desc->n_voltages == 1)) {
ret = rdev->desc->ops->list_voltage(rdev, 0);
} else {
return -EINVAL;
--
1.7.9.5
next reply other threads:[~2012-08-10 1:32 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-08-10 1:32 Axel Lin [this message]
2012-08-10 1:33 ` [PATCH 2/6] regulator: ab3100: Remove get_voltage implementation for regulator_ops_fixed Axel Lin
2012-08-13 12:31 ` Mark Brown
2012-08-10 1:34 ` [PATCH 3/6] regulator: ab8500: Remove get_voltage implementation for ab8500_regulator_fixed_ops Axel Lin
2012-08-10 1:35 ` [PATCH 4/6] regulator: isl6271a: Remove get_voltage implementation for isl_fixed_ops Axel Lin
2012-08-10 1:37 ` [PATCH 5/6] regulator: twl: Remove get_voltage implementation for single voltage regulators Axel Lin
2012-08-10 1:38 ` [PATCH 6/6] regulator: mc13xxx: " Axel Lin
2012-08-10 10:05 ` [PATCH 1/6] regulator: core: Add checking n_voltages if using list_voltage() to read " Mark Brown
2012-08-10 12:27 ` Axel Lin
2012-08-10 12:29 ` Mark Brown
2012-08-11 2:22 ` Axel Lin
2012-08-13 12:30 ` Mark Brown
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=1344562353.2996.1.camel@phoenix \
--to=axel.lin@gmail.com \
--cc=broonie@opensource.wolfsonmicro.com \
--cc=linux-kernel@vger.kernel.org \
--cc=lrg@ti.com \
/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).