Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751972AbcDORol (ORCPT ); Fri, 15 Apr 2016 13:44:41 -0400 Received: from smtp.codeaurora.org ([198.145.29.96]:40412 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750709AbcDORoj (ORCPT ); Fri, 15 Apr 2016 13:44:39 -0400 From: Stephen Boyd To: Mark Brown Cc: linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Rajendra Nayak Subject: [PATCH] regulator: qcom_spmi: Always return a selector when asked Date: Fri, 15 Apr 2016 10:44:37 -0700 Message-Id: <1460742277-2838-1-git-send-email-sboyd@codeaurora.org> X-Mailer: git-send-email 2.6.3.369.g91ad409 In-Reply-To: <5710BFE7.9060802@codeaurora.org> References: <1459389470-29365-1-git-send-email-stephen.boyd@linaro.org> <1459389470-29365-3-git-send-email-stephen.boyd@linaro.org> <1459389470-29365-3-git-send-email-stephen.boyd@linaro.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1208 Lines: 29 I had a thinko in spmi_regulator_select_voltage_same_range() when converting it to return selectors via the function's return value instead of by modifying a pointer argument. I only tested multi-range regulators so this passed through testing. Fix it by returning the selector here. Fixes: 1b5b19689278 ("regulator: qcom_spmi: Only use selector based regulator ops") Reported-by: Rajendra Nayak Signed-off-by: Stephen Boyd --- drivers/regulator/qcom_spmi-regulator.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/regulator/qcom_spmi-regulator.c b/drivers/regulator/qcom_spmi-regulator.c index f502f2cc65d8..84cce21e98cd 100644 --- a/drivers/regulator/qcom_spmi-regulator.c +++ b/drivers/regulator/qcom_spmi-regulator.c @@ -692,7 +692,7 @@ static int spmi_regulator_select_voltage_same_range(struct spmi_regulator *vreg, if (selector >= vreg->set_points->n_voltages) goto different_range; - return 0; + return selector; different_range: return spmi_regulator_select_voltage(vreg, min_uV, max_uV); -- The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project