diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-12-16 08:59:10 -0500 |
---|---|---|
committer | Liam Girdwood <lrg@slimlogic.co.uk> | 2011-01-12 09:33:05 -0500 |
commit | ded06a5270ddd6c3c3e25d9ddcaaaa4cb8385c2f (patch) | |
tree | a845d31f0bdc663fbbd3fde7dcd9ed638b963c66 /drivers/regulator | |
parent | e8eef82b2c652d031bee9dff9762325672f5a1e0 (diff) |
regulator: Only notify voltage changes when they succeed
Currently we notify a voltage change whenever we exit set_voltage(),
even if the change failed for some reason (eg, a constraints issue).
This shouldn't cause any substantial ill effects but is wasteful as
listeners get notified on noops. Fix this by moving the notification
into _do_set_voltage() and only notifying if we don't return an error.
Reported-by: Saravana Kannan <skannan@codeaurora.org>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
Diffstat (limited to 'drivers/regulator')
-rw-r--r-- | drivers/regulator/core.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c index a0579f069002..3d72cc8e2f3e 100644 --- a/drivers/regulator/core.c +++ b/drivers/regulator/core.c | |||
@@ -1667,6 +1667,10 @@ static int _regulator_do_set_voltage(struct regulator_dev *rdev, | |||
1667 | ret = -EINVAL; | 1667 | ret = -EINVAL; |
1668 | } | 1668 | } |
1669 | 1669 | ||
1670 | if (ret == 0) | ||
1671 | _notifier_call_chain(rdev, REGULATOR_EVENT_VOLTAGE_CHANGE, | ||
1672 | NULL); | ||
1673 | |||
1670 | trace_regulator_set_voltage_complete(rdev_get_name(rdev), selector); | 1674 | trace_regulator_set_voltage_complete(rdev_get_name(rdev), selector); |
1671 | 1675 | ||
1672 | return ret; | 1676 | return ret; |
@@ -1718,7 +1722,6 @@ int regulator_set_voltage(struct regulator *regulator, int min_uV, int max_uV) | |||
1718 | ret = _regulator_do_set_voltage(rdev, min_uV, max_uV); | 1722 | ret = _regulator_do_set_voltage(rdev, min_uV, max_uV); |
1719 | 1723 | ||
1720 | out: | 1724 | out: |
1721 | _notifier_call_chain(rdev, REGULATOR_EVENT_VOLTAGE_CHANGE, NULL); | ||
1722 | mutex_unlock(&rdev->mutex); | 1725 | mutex_unlock(&rdev->mutex); |
1723 | return ret; | 1726 | return ret; |
1724 | } | 1727 | } |