From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 30825198837; Wed, 2 Oct 2024 13:59:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727877581; cv=none; b=VCeM12DiPBW8jlm2RrV4pj0qtZLXRViRQsovKwFdEopGEBcxmFA6IObafNv8+83x1FykIyNp9Qyu+eSPLIvl9tNDHL0IkntXQcttYmtgQqDnoM9VzgI7ArCuDb0Sb71uutUsufBp4b6yUkqlzLzX2EejT9qZiKlk9aZnMTt80tk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727877581; c=relaxed/simple; bh=qH4gwWmKKNIL4jqow2H7XU6bPzWG7bnxDfE2mdrKjXQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=QxdLb8Q+yQTzUkz/CQDrM/KQN9bPz5ZK61dNrOCRe1KRh/PS6WQCem5A33WpWJ27rn4GSvdYEld0tEOqwGl/vw5ILNtX0tUJ01NOKh0EEdimcztlj5HMjnL44gfZG4KmQRe0Bn9g+NRzIGcHcON0GPp4tU5y9vJUtDEP4t/j8kE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=k6s60Jpu; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="k6s60Jpu" Received: by smtp.kernel.org (Postfix) with ESMTPSA id ABC55C4CECD; Wed, 2 Oct 2024 13:59:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1727877581; bh=qH4gwWmKKNIL4jqow2H7XU6bPzWG7bnxDfE2mdrKjXQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=k6s60JpuD04qbpR987zSWQJgq4eKku0hj6lup9Po3DjBgyQONm9PJ+QCOvN0OdFKR MQPArNZ/ZJoJ1yL2ECvmQ8BAjBk8KnA2IoSVv26dftFQZXudn6UQLWSLM7ZqRC/mwX pKvH1YiF8Jm0YgHT0Jji3YwrsLI5HVFAiat0N0R0= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Chen-Yu Tsai , Mark Brown , Sasha Levin Subject: [PATCH 6.10 123/634] regulator: Return actual error in of_regulator_bulk_get_all() Date: Wed, 2 Oct 2024 14:53:43 +0200 Message-ID: <20241002125815.967442993@linuxfoundation.org> X-Mailer: git-send-email 2.46.2 In-Reply-To: <20241002125811.070689334@linuxfoundation.org> References: <20241002125811.070689334@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.10-stable review patch. If anyone has any objections, please let me know. ------------------ From: Chen-Yu Tsai [ Upstream commit 395a41a1d3e377462f3eea8a205ee72be8885ff6 ] If regulator_get() in of_regulator_bulk_get_all() returns an error, that error gets overridden and -EINVAL is always passed out. This masks probe deferral requests and likely won't work properly in all cases. Fix this by letting of_regulator_bulk_get_all() return the original error code. Fixes: 27b9ecc7a9ba ("regulator: Add of_regulator_bulk_get_all") Signed-off-by: Chen-Yu Tsai Link: https://patch.msgid.link/20240822072047.3097740-3-wenst@chromium.org Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- drivers/regulator/of_regulator.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/regulator/of_regulator.c b/drivers/regulator/of_regulator.c index 03afc160fc72c..86b680adbf01c 100644 --- a/drivers/regulator/of_regulator.c +++ b/drivers/regulator/of_regulator.c @@ -777,7 +777,7 @@ int of_regulator_bulk_get_all(struct device *dev, struct device_node *np, name[i] = '\0'; tmp = regulator_get(dev, name); if (IS_ERR(tmp)) { - ret = -EINVAL; + ret = PTR_ERR(tmp); goto error; } (*consumers)[n].consumer = tmp; -- 2.43.0