public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Mark Brown <broonie@kernel.org>
To: Dong Aisheng <aisheng.dong@nxp.com>
Cc: linux-kernel@vger.kernel.org, Mark Brown <broonie@kernel.org>
Subject: [PATCH 1/2] regulator: core: Only propagate voltage changes to if it can change voltages
Date: Thu, 13 Apr 2017 19:03:15 +0100	[thread overview]
Message-ID: <20170413180316.617-1-broonie@kernel.org> (raw)

When we are propagating voltage changes to parent regulators don't
bother if the parent does not have permission to change voltages.  This
simplifies error checking in the function for cases where the regulator
lacks some of the voltage operations.

Reported-by: Dong Aisheng <aisheng.dong@nxp.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
---

Untested.

 drivers/regulator/core.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
index 82205cc5daa7..2b464a286451 100644
--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@ -2959,8 +2959,10 @@ static int regulator_set_voltage_unlocked(struct regulator *regulator,
 	if (ret < 0)
 		goto out2;
 
-	if (rdev->supply && (rdev->desc->min_dropout_uV ||
-				!rdev->desc->ops->get_voltage)) {
+	if (rdev->supply &&
+	    regulator_ops_is_valid(rdev->supply->rdev,
+				   REGULATOR_CHANGE_VOLTAGE) &&
+	    (rdev->desc->min_dropout_uV || !rdev->desc->ops->get_voltage)) {
 		int current_supply_uV;
 		int selector;
 
-- 
2.11.0

             reply	other threads:[~2017-04-13 18:03 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-04-13 18:03 Mark Brown [this message]
2017-04-13 18:03 ` [PATCH 2/2] regulator: core: Allow dummy regulators for supplies Mark Brown
2017-04-14 13:44   ` Dong Aisheng
2017-04-14 13:43 ` [PATCH 1/2] regulator: core: Only propagate voltage changes to if it can change voltages Dong Aisheng
2017-04-14 17:12 ` Applied "regulator: core: Only propagate voltage changes to if it can change voltages" to the regulator tree Mark Brown
2017-04-14 17:12 ` 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=20170413180316.617-1-broonie@kernel.org \
    --to=broonie@kernel.org \
    --cc=aisheng.dong@nxp.com \
    --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