From patchwork Tue Oct 30 16:48:58 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hongbo Zhang X-Patchwork-Id: 1671331 Return-Path: X-Original-To: patchwork-linux-pm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 65D963FD2B for ; Tue, 30 Oct 2012 16:51:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S964931Ab2J3QuA (ORCPT ); Tue, 30 Oct 2012 12:50:00 -0400 Received: from mail-bk0-f46.google.com ([209.85.214.46]:55905 "EHLO mail-bk0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S964899Ab2J3Qt7 (ORCPT ); Tue, 30 Oct 2012 12:49:59 -0400 Received: by mail-bk0-f46.google.com with SMTP id jk13so281014bkc.19 for ; Tue, 30 Oct 2012 09:49:58 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=AzGBQ23jl0wFyKEHey5PqdgLIieRnJr66f68FH6Un48=; b=KdUwQ9vrcOwKilL1iG46zifBd/JO7XKGQ3Bn8XOwb3ZPRy/pvC9sbrVzx66qbmAVR2 RHJ4EBLbc+a6orGuK6OCxFwfLz/f9yt0HrrW+iftPOnxahCBVTLLBQjdrcO958KA4O9s UYO/SoTi5UtJPdz2msJtAiY/sssWNKJJsovOn8b+6W+NbBwKnsMvSH/dxlDHVeehhAcO ahbAqsNBqcQ5NdeFmWAdI2AJZN9uNTqELsEkcNt7trZBunl+W5gJgTFdA6UJ1u4qmdDR M6apzC/ypXzhcaGrEGbHRJLj135Hku5VQv5F2tXvotPRb+JzLMtc8t+nANGybtOXPWNW 9zOQ== Received: by 10.204.148.21 with SMTP id n21mr10613870bkv.124.1351615798318; Tue, 30 Oct 2012 09:49:58 -0700 (PDT) Received: from localhost.localdomain ([91.224.175.20]) by mx.google.com with ESMTPS id v14sm1673891bkv.10.2012.10.30.09.49.56 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 30 Oct 2012 09:49:57 -0700 (PDT) From: "hongbo.zhang" To: linaro-dev@lists.linaro.org, linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org, rui.zhang@intel.com, amit.kachhap@linaro.org Cc: patches@linaro.org, linaro-kernel@lists.linaro.org, STEricsson_nomadik_linux@list.st.com, kernel@igloocommunity.org, "hongbo.zhang" Subject: [PATCH V3 2/5] Thermal: fix bug of counting cpu frequencies. Date: Tue, 30 Oct 2012 17:48:58 +0100 Message-Id: <1351615741-24134-3-git-send-email-hongbo.zhang@linaro.com> X-Mailer: git-send-email 1.7.11.3 In-Reply-To: <1351615741-24134-1-git-send-email-hongbo.zhang@linaro.com> References: <1351079900-32236-1-git-send-email-hongbo.zhang@linaro.com> <1351615741-24134-1-git-send-email-hongbo.zhang@linaro.com> X-Gm-Message-State: ALoCoQkjXMbYWQdiaP3YoX3lL+WprAwi861JsO1FV9Qw2jkhsoJwGgo2H7+MZtDffIQrK0nSPcNi Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org From: "hongbo.zhang" In the while loop for counting cpu frequencies, if table[i].frequency equals CPUFREQ_ENTRY_INVALID, index i won't be increased, so this leads to an endless loop, what's more the index i cannot be referred as cpu frequencies number if there is CPUFREQ_ENTRY_INVALID case. Signed-off-by: hongbo.zhang Reviewed-by: Viresh Kumar Reviewed-by: Amit Daniel Kachhap --- drivers/thermal/cpu_cooling.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/drivers/thermal/cpu_cooling.c b/drivers/thermal/cpu_cooling.c index b6b4c2a..bfd62b7 100644 --- a/drivers/thermal/cpu_cooling.c +++ b/drivers/thermal/cpu_cooling.c @@ -245,6 +245,7 @@ static int cpufreq_get_max_state(struct thermal_cooling_device *cdev, struct cpumask *maskPtr; unsigned int cpu; struct cpufreq_frequency_table *table; + unsigned long count = 0; mutex_lock(&cooling_cpufreq_lock); list_for_each_entry(cpufreq_device, &cooling_cpufreq_list, node) { @@ -263,13 +264,14 @@ static int cpufreq_get_max_state(struct thermal_cooling_device *cdev, goto return_get_max_state; } - while (table[i].frequency != CPUFREQ_TABLE_END) { + for (i = 0; (table[i].frequency != CPUFREQ_TABLE_END); i++) { if (table[i].frequency == CPUFREQ_ENTRY_INVALID) continue; - i++; + count++; } - if (i > 0) { - *state = --i; + + if (count > 0) { + *state = --count; ret = 0; }