From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965225AbbJ0RhD (ORCPT ); Tue, 27 Oct 2015 13:37:03 -0400 Received: from mail-wi0-f173.google.com ([209.85.212.173]:37083 "EHLO mail-wi0-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965668AbbJ0ReD (ORCPT ); Tue, 27 Oct 2015 13:34:03 -0400 From: =?UTF-8?q?B=C3=A1lint=20Czobor?= To: "Rafael J. Wysocki" , Viresh Kumar Cc: linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org, Junjie Wu , =?UTF-8?q?B=C3=A1lint=20Czobor?= Subject: [PATCH 67/70] cpufreq: interactive: Put global cpufreq kobject on failure Date: Tue, 27 Oct 2015 18:30:55 +0100 Message-Id: <1445967059-6897-67-git-send-email-czoborbalint@gmail.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1445967059-6897-1-git-send-email-czoborbalint@gmail.com> References: <1445967059-6897-1-git-send-email-czoborbalint@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Junjie Wu Fix failure recovery path in cpufreq_governor_interactive(). Call cpufreq_put_global_kobject() to release cpufreq global kobject upon governor init failure. Change-Id: I7a977070b7a3c75c90acccd2c117064ed1a10d0e Signed-off-by: Junjie Wu Signed-off-by: Bálint Czobor --- drivers/cpufreq/cpufreq_interactive.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/cpufreq/cpufreq_interactive.c b/drivers/cpufreq/cpufreq_interactive.c index 9faa189..2055266 100644 --- a/drivers/cpufreq/cpufreq_interactive.c +++ b/drivers/cpufreq/cpufreq_interactive.c @@ -1180,8 +1180,10 @@ static int cpufreq_governor_interactive(struct cpufreq_policy *policy, if (rc) { kfree(tunables); policy->governor_data = NULL; - if (!have_governor_per_policy()) + if (!have_governor_per_policy()) { common_tunables = NULL; + cpufreq_put_global_kobject(); + } return rc; } -- 1.7.9.5