From patchwork Fri Nov 28 09:44:09 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Viresh Kumar X-Patchwork-Id: 41682 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wg0-f70.google.com (mail-wg0-f70.google.com [74.125.82.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 1FECD244C2 for ; Fri, 28 Nov 2014 09:45:39 +0000 (UTC) Received: by mail-wg0-f70.google.com with SMTP id b13sf3895841wgh.1 for ; Fri, 28 Nov 2014 01:45:38 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:in-reply-to:references :sender:precedence:list-id:x-original-sender :x-original-authentication-results:mailing-list:list-post:list-help :list-archive:list-unsubscribe; bh=ct8LFHgWxqghn6m3A0aElG5zRZ8kqCYc7qVHCECV+EU=; b=aAxPbGRO5I7S37LpDVwzW2U0uJ8zZLgboOUIaMZevEyZ2d12xCT6gWYZb4Kr6D+RHS TJAdn8y/MfQsZa7ENJyMIPi2b4WKMu6NHXxiOwNXQavATA9bzKa2tDBt4p0FclEaggbI YGeRIG+c8w0Mp/FzXg7oWonDBrIr+NaWGSZ1erhP5cqGivhHMXUEDwA/NqbkzboKQpcv DyQFmo5PvSKUt4ILB6eS9fA1mrpTkred8EUTw9apey7qWb74Pz4GLU7um78m2tHwGO0E 8UkjPElvNPI0DN9sl3MOzdFR2Q6pP3STMza8ARW3odnMskSV8jc8YEQrDiqXC6nqZol+ iffQ== X-Gm-Message-State: ALoCoQnU0sv3vCE5mkZ0sR3xylIjpgwxM3cHfUWzJmxNFPo5cOY6j1otp5rbt8TxvKaVej/VI4uq X-Received: by 10.194.133.39 with SMTP id oz7mr3599170wjb.3.1417167938324; Fri, 28 Nov 2014 01:45:38 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.153.7.132 with SMTP id dc4ls743728lad.97.gmail; Fri, 28 Nov 2014 01:45:38 -0800 (PST) X-Received: by 10.112.234.201 with SMTP id ug9mr43481034lbc.14.1417167938033; Fri, 28 Nov 2014 01:45:38 -0800 (PST) Received: from mail-lb0-f173.google.com (mail-lb0-f173.google.com. [209.85.217.173]) by mx.google.com with ESMTPS id v1si9477920lag.49.2014.11.28.01.45.38 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 28 Nov 2014 01:45:38 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.173 as permitted sender) client-ip=209.85.217.173; Received: by mail-lb0-f173.google.com with SMTP id z12so5331015lbi.18 for ; Fri, 28 Nov 2014 01:45:38 -0800 (PST) X-Received: by 10.112.62.166 with SMTP id z6mr41983455lbr.74.1417167937946; Fri, 28 Nov 2014 01:45:37 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.184.201 with SMTP id ew9csp60467lbc; Fri, 28 Nov 2014 01:45:37 -0800 (PST) X-Received: by 10.70.119.70 with SMTP id ks6mr18967310pdb.80.1417167936326; Fri, 28 Nov 2014 01:45:36 -0800 (PST) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id vj10si15336419pbc.138.2014.11.28.01.45.35 for ; Fri, 28 Nov 2014 01:45:36 -0800 (PST) Received-SPF: none (google.com: linux-pm-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751687AbaK1Jpe (ORCPT + 12 others); Fri, 28 Nov 2014 04:45:34 -0500 Received: from mail-pd0-f171.google.com ([209.85.192.171]:56127 "EHLO mail-pd0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751293AbaK1Jpd (ORCPT ); Fri, 28 Nov 2014 04:45:33 -0500 Received: by mail-pd0-f171.google.com with SMTP id y13so6405472pdi.16 for ; Fri, 28 Nov 2014 01:45:33 -0800 (PST) X-Received: by 10.68.241.130 with SMTP id wi2mr70635388pbc.89.1417167933363; Fri, 28 Nov 2014 01:45:33 -0800 (PST) Received: from localhost ([122.167.111.40]) by mx.google.com with ESMTPSA id xg4sm9455004pab.8.2014.11.28.01.45.32 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Fri, 28 Nov 2014 01:45:32 -0800 (PST) From: Viresh Kumar To: linux-pm@vger.kernel.org, edubezval@gmail.com Cc: linaro-kernel@lists.linaro.org, rui.zhang@intel.com, Viresh Kumar Subject: [PATCH 15/26] cpu_cooling: do error handling at the bottom in __cpufreq_cooling_register() Date: Fri, 28 Nov 2014 15:14:09 +0530 Message-Id: <01711a86da59f30b33e1c32aa29cc9b378d0c627.1417167599.git.viresh.kumar@linaro.org> X-Mailer: git-send-email 2.0.3.693.g996b0fd In-Reply-To: References: In-Reply-To: References: Sender: linux-pm-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: viresh.kumar@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.173 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , This makes life easy and bug free. And is scalable for future resource allocations. Signed-off-by: Viresh Kumar --- drivers/thermal/cpu_cooling.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/drivers/thermal/cpu_cooling.c b/drivers/thermal/cpu_cooling.c index 41aa7d5..032cba3 100644 --- a/drivers/thermal/cpu_cooling.c +++ b/drivers/thermal/cpu_cooling.c @@ -440,8 +440,8 @@ __cpufreq_cooling_register(struct device_node *np, ret = get_idr(&cpufreq_idr, &cpufreq_dev->id); if (ret) { - kfree(cpufreq_dev); - return ERR_PTR(cpufreq_dev->id); + cool_dev = ERR_PTR(cpufreq_dev->id); + goto free_cdev; } snprintf(dev_name, sizeof(dev_name), "thermal-cpufreq-%d", @@ -449,11 +449,9 @@ __cpufreq_cooling_register(struct device_node *np, cool_dev = thermal_of_cooling_device_register(np, dev_name, cpufreq_dev, &cpufreq_cooling_ops); - if (IS_ERR(cool_dev)) { - release_idr(&cpufreq_idr, cpufreq_dev->id); - kfree(cpufreq_dev); - return cool_dev; - } + if (IS_ERR(cool_dev)) + goto remove_idr; + cpufreq_dev->cool_dev = cool_dev; mutex_lock(&cooling_cpufreq_lock); @@ -467,6 +465,13 @@ __cpufreq_cooling_register(struct device_node *np, mutex_unlock(&cooling_cpufreq_lock); return cool_dev; + +remove_idr: + release_idr(&cpufreq_idr, cpufreq_dev->id); +free_cdev: + kfree(cpufreq_dev); + + return cool_dev; } /**