* [PATCH v2] regulator: Fix _regulator_get_voltage if get_voltage callback is NULL
@ 2011-05-20 0:36 Axel Lin
2011-05-20 10:23 ` Mark Brown
0 siblings, 1 reply; 2+ messages in thread
From: Axel Lin @ 2011-05-20 0:36 UTC (permalink / raw)
To: linux-kernel; +Cc: Liam Girdwood, Mark Brown
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>
---
v2: remove unneeded goto.
drivers/regulator/core.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
index 9493f61..f11b0ba 100644
--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@ -1886,13 +1886,13 @@ static int _regulator_get_voltage(struct regulator_dev *rdev)
if (sel < 0)
return sel;
ret = rdev->desc->ops->list_voltage(rdev, sel);
- }
- if (rdev->desc->ops->get_voltage)
+ } else if (rdev->desc->ops->get_voltage) {
ret = rdev->desc->ops->get_voltage(rdev);
- else
+ } else {
return -EINVAL;
+ }
- return ret - rdev->constraints->uV_offset;
+ return ret < 0 ? ret : ret - rdev->constraints->uV_offset;
}
/**
--
1.7.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH v2] regulator: Fix _regulator_get_voltage if get_voltage callback is NULL
2011-05-20 0:36 [PATCH v2] regulator: Fix _regulator_get_voltage if get_voltage callback is NULL Axel Lin
@ 2011-05-20 10:23 ` Mark Brown
0 siblings, 0 replies; 2+ messages in thread
From: Mark Brown @ 2011-05-20 10:23 UTC (permalink / raw)
To: Axel Lin; +Cc: linux-kernel, Liam Girdwood
On Fri, May 20, 2011 at 08:36:06AM +0800, Axel Lin wrote:
> - return ret - rdev->constraints->uV_offset;
> + return ret < 0 ? ret : ret - rdev->constraints->uV_offset;
Please don't use the ternery operator, I find it does nothing for
legibility.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-05-20 10:23 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-05-20 0:36 [PATCH v2] regulator: Fix _regulator_get_voltage if get_voltage callback is NULL Axel Lin
2011-05-20 10:23 ` Mark Brown
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.