All of lore.kernel.org
 help / color / mirror / Atom feed
From: Axel Lin <axel.lin@gmail.com>
To: linux-kernel@vger.kernel.org
Cc: Liam Girdwood <lrg@slimlogic.co.uk>,
	Mark Brown <broonie@opensource.wolfsonmicro.com>
Subject: [RFC][PATCH] regulator: Fix _regulator_get_voltage if get_voltage callback is NULL
Date: Wed, 18 May 2011 21:01:58 +0800	[thread overview]
Message-ID: <1305723718.6172.6.camel@phoenix> (raw)

In the case of get_voltage callback is NULL, current implementation in
_regulator_get_voltage will return -EINVAL.

Also returns proper error if ret is negative value.

Signed-off-by: Axel Lin <axel.lin@gmail.com>
---
hi Mark,
I just found in commit 6b8e70 "regulator: Convert WM8400 to get_voltage_sel()",
you added get_voltage_sel callback and remove get_voltage callback.
I suspect you will hit this bug. Can you check it?

Thanks,
Axel

 drivers/regulator/core.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
index 9493f61..2262474 100644
--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@ -1886,13 +1886,15 @@ static int _regulator_get_voltage(struct regulator_dev *rdev)
 		if (sel < 0)
 			return sel;
 		ret = rdev->desc->ops->list_voltage(rdev, sel);
+		goto out;
 	}
 	if (rdev->desc->ops->get_voltage)
 		ret = rdev->desc->ops->get_voltage(rdev);
 	else
 		return -EINVAL;
 
-	return ret - rdev->constraints->uV_offset;
+out:
+	return ret < 0 ? ret : ret - rdev->constraints->uV_offset;
 }
 
 /**
-- 
1.7.1




             reply	other threads:[~2011-05-18 13:02 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-05-18 13:01 Axel Lin [this message]
2011-05-18 16:32 ` [RFC][PATCH] regulator: Fix _regulator_get_voltage if get_voltage callback is NULL Mark Brown
2011-05-19  1:47   ` Axel Lin
2011-05-19  9:58     ` Axel Lin
2011-05-19 21:08       ` 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=1305723718.6172.6.camel@phoenix \
    --to=axel.lin@gmail.com \
    --cc=broonie@opensource.wolfsonmicro.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=lrg@slimlogic.co.uk \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.