From patchwork Wed Oct 24 11:58:17 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hongbo Zhang X-Patchwork-Id: 1637891 Return-Path: X-Original-To: patchwork-linux-pm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 229D9DF238 for ; Wed, 24 Oct 2012 12:00:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758339Ab2JXL7S (ORCPT ); Wed, 24 Oct 2012 07:59:18 -0400 Received: from mail-pa0-f46.google.com ([209.85.220.46]:49142 "EHLO mail-pa0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758336Ab2JXL7O (ORCPT ); Wed, 24 Oct 2012 07:59:14 -0400 Received: by mail-pa0-f46.google.com with SMTP id hz1so313347pad.19 for ; Wed, 24 Oct 2012 04:59:14 -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=znmQu1xm4Ygpf3X88YQny8tx1Cb1UMeroVwqDUAGpBE=; b=HKlf6yk/qL4fA9t/RNWu9VddsbybXQAZjGSoSrZ5OQuDm9GIbff+ldcTKMvHkPykqd vZ0NgDRLHDbZWeNotRHFu1i8HgiSbvk6rZ2Fyxui7iA/yTRIgjqAix1f4OGpQckApUJI M6Bo+dXfBAb566qD+n0eGPSUAdWZEyGvPxJWoSqN/x2gEHiwuE2ATLCo0Q8AGcFfPXlT HWeXZlnxRQsTG7yxz7ErvBC6KSK4UQXpySdvKtkzM6EQRrsSi1pMKZuW5yYeb34Ke5uI v3dTW1vrmkPRTWjy8/77Y1ArdCnhUrZvOEYKfCc4YTB6bbr2gsVv0wmsC6tlOVOx8Use 6C4w== Received: by 10.66.84.131 with SMTP id z3mr43463766pay.34.1351079954418; Wed, 24 Oct 2012 04:59:14 -0700 (PDT) Received: from stebjsxu0148.bjs.st.com ([124.127.135.94]) by mx.google.com with ESMTPS id nm2sm9357200pbc.43.2012.10.24.04.59.08 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 24 Oct 2012 04:59:13 -0700 (PDT) From: "hongbo.zhang" To: linaro-dev@lists.linaro.org, linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org Cc: patches@linaro.org, linaro-kernel@lists.linaro.org, STEricsson_nomadik_linux@list.st.com, kernel@igloocommunity.org, "hongbo.zhang" Subject: [PATCH V2 3/6] Thermal: fix bug of counting cpu frequencies. Date: Wed, 24 Oct 2012 19:58:17 +0800 Message-Id: <1351079900-32236-4-git-send-email-hongbo.zhang@linaro.com> X-Mailer: git-send-email 1.7.11.3 In-Reply-To: <1351079900-32236-1-git-send-email-hongbo.zhang@linaro.com> References: <1350387889-15324-1-git-send-email-hongbo.zhang@linaro.com> <1351079900-32236-1-git-send-email-hongbo.zhang@linaro.com> X-Gm-Message-State: ALoCoQkI+HowgP4V1bw/koB1c3bcwBhWssQsYUsvEsHJFby0ORijyreqRWFMBGdgUp8ozq+uPQ6z 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 7519a0b..415b041 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; }