From patchwork Fri Nov 23 13:12:38 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Baltieri X-Patchwork-Id: 1795421 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 C1FE13FC64 for ; Fri, 23 Nov 2012 13:12:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751536Ab2KWNMu (ORCPT ); Fri, 23 Nov 2012 08:12:50 -0500 Received: from mail-wi0-f174.google.com ([209.85.212.174]:49704 "EHLO mail-wi0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751399Ab2KWNMt (ORCPT ); Fri, 23 Nov 2012 08:12:49 -0500 Received: by mail-wi0-f174.google.com with SMTP id hm9so1642534wib.1 for ; Fri, 23 Nov 2012 05:12:48 -0800 (PST) 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:x-gm-message-state; bh=ok6w5pVvmMK37fL+phzrGrQ15+PHG+GTQzBVxKFQgnU=; b=a1tAWifcBcwWb0sZ2ISRpyFRH4Ha4hBVzniq0b8ohVhgw/1d71kxHd0rkF9vufqafj vACVwqtAV3WyvqC2AuupNLBPfd1xI5gMx8rdfMiohS70cEgyf0N/gk+WfjhYRh4vx10S sHwXxrZrHOG/gbaRD08AknqjwcRkeTj7tuIxJJ+9xzgc6YIXthpMSVYcwCC1fmuX/TCg UmwvRCZIhiyEtn/pa092FlRw8aAdK3+9IQjxErCh6PCJTfcYoGuqqH2peavr7QAhhyR/ R55Zw5mW4JxednRD2FIPeRFu969KObP60ggsETM/dvshfTydshI8v4yagDjkPhzm5jtd NzGA== Received: by 10.180.85.165 with SMTP id i5mr2245080wiz.11.1353676367709; Fri, 23 Nov 2012 05:12:47 -0800 (PST) Received: from localhost ([2a01:2029:1:1304:8e70:5aff:feac:ad8]) by mx.google.com with ESMTPS id az2sm8515974wib.7.2012.11.23.05.12.45 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 23 Nov 2012 05:12:47 -0800 (PST) From: Fabio Baltieri To: "Rafael J. Wysocki" , cpufreq@vger.kernel.org, linux-pm@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Fabio Baltieri , Viresh Kumar Subject: [PATCH] cpufreq: ondemand: fix wrong delay sampling rate Date: Fri, 23 Nov 2012 14:12:38 +0100 Message-Id: <1353676358-4385-1-git-send-email-fabio.baltieri@linaro.org> X-Mailer: git-send-email 1.7.12.1 X-Gm-Message-State: ALoCoQliNNQzPZhtBmOpKcv8VhxnyjYE7TdJWxJtKMkI6HCJa4cq+BeKqJhzDCRMQ7XPxYavRY9Y Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org Restore the correct delay value for ondemand's od_dbs_timer, as it was changed erroneously in 83f0e55. Cc: Viresh Kumar Signed-off-by: Fabio Baltieri Reviewed-by: Viresh Kumar --- drivers/cpufreq/cpufreq_ondemand.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/cpufreq/cpufreq_ondemand.c b/drivers/cpufreq/cpufreq_ondemand.c index bdaab92..cca3e9f 100644 --- a/drivers/cpufreq/cpufreq_ondemand.c +++ b/drivers/cpufreq/cpufreq_ondemand.c @@ -234,7 +234,8 @@ static void od_dbs_timer(struct work_struct *work) dbs_info->sample_type = OD_SUB_SAMPLE; delay = dbs_info->freq_hi_jiffies; } else { - delay = delay_for_sampling_rate(dbs_info->rate_mult); + delay = delay_for_sampling_rate(od_tuners.sampling_rate + * dbs_info->rate_mult); } }