From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:38948 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752384AbbJQURq (ORCPT ); Sat, 17 Oct 2015 16:17:46 -0400 Subject: Patch "regulator: core: Correct return value check in regulator_resolve_supply" has been added to the 4.2-stable tree To: ckeepax@opensource.wolfsonmicro.com, broonie@kernel.org, gregkh@linuxfoundation.org Cc: , From: Date: Sat, 17 Oct 2015 13:17:45 -0700 Message-ID: <144511306525070@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org List-ID: This is a note to let you know that I've just added the patch titled regulator: core: Correct return value check in regulator_resolve_supply to the 4.2-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: regulator-core-correct-return-value-check-in-regulator_resolve_supply.patch and it can be found in the queue-4.2 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >>From 23c3f310e897837aeb8ffe8700b803cb58e7b35d Mon Sep 17 00:00:00 2001 From: Charles Keepax Date: Thu, 17 Sep 2015 14:50:20 +0100 Subject: regulator: core: Correct return value check in regulator_resolve_supply From: Charles Keepax commit 23c3f310e897837aeb8ffe8700b803cb58e7b35d upstream. The ret pointer passed to regulator_dev_lookup is only filled with a valid error code if regulator_dev_lookup returned NULL. Currently regulator_resolve_supply checks this ret value before it checks if a regulator was returned, this can result in valid regulator lookups being ignored. Fixes: 6261b06de565 ("regulator: Defer lookup of supply to regulator_get") Signed-off-by: Charles Keepax Signed-off-by: Mark Brown Signed-off-by: Greg Kroah-Hartman --- drivers/regulator/core.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) --- a/drivers/regulator/core.c +++ b/drivers/regulator/core.c @@ -1376,15 +1376,15 @@ static int regulator_resolve_supply(stru return 0; r = regulator_dev_lookup(dev, rdev->supply_name, &ret); - if (ret == -ENODEV) { - /* - * No supply was specified for this regulator and - * there will never be one. - */ - return 0; - } - if (!r) { + if (ret == -ENODEV) { + /* + * No supply was specified for this regulator and + * there will never be one. + */ + return 0; + } + if (have_full_constraints()) { r = dummy_regulator_rdev; } else { Patches currently in stable-queue which might be from ckeepax@opensource.wolfsonmicro.com are queue-4.2/regulator-core-correct-return-value-check-in-regulator_resolve_supply.patch