Received: by 2002:a05:6a10:f347:0:0:0:0 with SMTP id d7csp5450874pxu; Tue, 22 Dec 2020 18:23:03 -0800 (PST) X-Google-Smtp-Source: ABdhPJzujAFuW0niKXqtExozCq2TQx0ghJd02WxItWS0qQMYJ2kRyuyHxJ2zUkiB+UV+rc6pvQ/c X-Received: by 2002:a17:906:4e52:: with SMTP id g18mr22937945ejw.385.1608690183232; Tue, 22 Dec 2020 18:23:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1608690183; cv=none; d=google.com; s=arc-20160816; b=qbGQr+5MRu8qCzDika4BFz1qBzRaSOtvt9DKrcTj60S8/1W6DcfaHRW6fVJ0SXQaMb GINEdW4iTz2wx11iV0byHRO7J4SQD0xPyzrVZHPgaZy2Rl/j/lmYcuhK4e5iM7mawbFl FICxSVjWqZXW6201P8cJxtYtgwjVhmoJtJwVrkmkLkDtFZ6fEcem+TWLcZ3FVhVZik2m RXbiDhPn9yeewOVhPf6Ee4AwzWM2M4Jl5z5c8+C37OYvOPmJtioxILQLFzB+KgUv0hZ/ olaEMXb2WYNGhmDZuN8f9hs5/y9r4DHLVRRiPJrsom/P1c1odBn4/v+FrfMOovMkjBUm naOg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=GPPx4V4Sb+XDzPLZUIBIdbW+p0mjJvY+wj4V1vHn/aI=; b=cLp6AK/pycXmaMbkOJnTkAVZ/dt9kxOPcSD6FWaOxTR/0dUD9vXP7ZSAv3qREuHLw5 NePDMRnHYRK5wBXCx5F1dlFBQc6dDkURpMBR5PqnsWh7QxkHBVdv4XcHqQGFLmJ4Zf44 +FxGE7Iq+qthwckNjzn+d00QpaPMjZMOdnvNZAqC0NVgzqe0hR+fZZPVgSUAtaFHEcJM ZzNLva0S/OObS8tbwobgkumZMaHrKEU2SGRkfhLenMMD4ajVN/L85gw6xo4K7KHjywqD KB2U33+VCoiC/U0kUO2eXZ6z8riFRywP+QkgIu1R70JgubvPGSl/q0lXZoGvYVpu474/ 1yRA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=RV70dsEv; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id n15si15172551edy.394.2020.12.22.18.22.41; Tue, 22 Dec 2020 18:23:03 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=RV70dsEv; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729370AbgLWCVd (ORCPT + 99 others); Tue, 22 Dec 2020 21:21:33 -0500 Received: from mail.kernel.org ([198.145.29.99]:46354 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729264AbgLWCVP (ORCPT ); Tue, 22 Dec 2020 21:21:15 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id 2530123159; Wed, 23 Dec 2020 02:20:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1608690057; bh=0d00F80+U8kMZ21VJjFI0YdSZN9PalaSgFSCylhm5tY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RV70dsEvxmXoD/wpl5GECkVlxpZH75KBMrpTx5h1F9kXI9NUkYmRd2dvNQGU92pgS JlpWg6DZag6I0UW1EZbbcITTDw0ANEoQQvAqtwTqikXDXxZilAkqCugofHyucgfp5v WpvNuMJIG2Y98BfIouUxmG3gDWFJlb6TO5R1L11fvHBDNhegbHOOoa/IvTWrtbLDt5 zSSpMaZXqVFzxwqx4849esS/dIof8lIT/HQwJOXIg8d6aa5p1UbhGMg5ic6JZDaCOY HfIrzu45h7fAQ1PCCOkHhQB9vCnXNkmefEx/TW3pqwAYwNIh1H1Sqq+QrG5Mnuhdx1 X7PCOWMRdbxpw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Wang ShaoBo , "Rafael J . Wysocki" , Sasha Levin , linux-pm@vger.kernel.org Subject: [PATCH AUTOSEL 5.4 127/130] cpufreq: Fix cpufreq_online() return value on errors Date: Tue, 22 Dec 2020 21:18:10 -0500 Message-Id: <20201223021813.2791612-127-sashal@kernel.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20201223021813.2791612-1-sashal@kernel.org> References: <20201223021813.2791612-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Wang ShaoBo [ Upstream commit b96f038432362a20b96d4c52cefeb2936e2cfd2f ] Make cpufreq_online() return negative error codes on all errors that cause the policy to be destroyed, as appropriate. Signed-off-by: Wang ShaoBo [ rjw: Subject and changelog edits ] Signed-off-by: Rafael J. Wysocki Signed-off-by: Sasha Levin --- drivers/cpufreq/cpufreq.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c index 194a6587a1de1..1178ac323a9e0 100644 --- a/drivers/cpufreq/cpufreq.c +++ b/drivers/cpufreq/cpufreq.c @@ -1384,8 +1384,10 @@ static int cpufreq_online(unsigned int cpu) policy->min_freq_req = kzalloc(2 * sizeof(*policy->min_freq_req), GFP_KERNEL); - if (!policy->min_freq_req) + if (!policy->min_freq_req) { + ret = -ENOMEM; goto out_destroy_policy; + } ret = freq_qos_add_request(&policy->constraints, policy->min_freq_req, FREQ_QOS_MIN, @@ -1422,6 +1424,7 @@ static int cpufreq_online(unsigned int cpu) if (cpufreq_driver->get && has_target()) { policy->cur = cpufreq_driver->get(policy->cpu); if (!policy->cur) { + ret = -EIO; pr_err("%s: ->get() failed\n", __func__); goto out_destroy_policy; } -- 2.27.0