From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755289AbdDMSDb (ORCPT ); Thu, 13 Apr 2017 14:03:31 -0400 Received: from mezzanine.sirena.org.uk ([106.187.55.193]:46446 "EHLO mezzanine.sirena.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752153AbdDMSD0 (ORCPT ); Thu, 13 Apr 2017 14:03:26 -0400 From: Mark Brown To: Dong Aisheng Cc: linux-kernel@vger.kernel.org, Mark Brown Date: Thu, 13 Apr 2017 19:03:15 +0100 Message-Id: <20170413180316.617-1-broonie@kernel.org> X-Mailer: git-send-email 2.11.0 X-SA-Exim-Connect-IP: 2001:470:1f1d:6b5::3 X-SA-Exim-Mail-From: broonie@sirena.org.uk Subject: [PATCH 1/2] regulator: core: Only propagate voltage changes to if it can change voltages X-SA-Exim-Version: 4.2.1 (built Mon, 26 Dec 2011 16:24:06 +0000) X-SA-Exim-Scanned: No (on mezzanine.sirena.org.uk); Unknown failure Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 Signed-off-by: Mark Brown --- 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