From patchwork Mon Oct 26 07:39:03 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frans Pop X-Patchwork-Id: 55836 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n9Q7ewr0008481 for ; Mon, 26 Oct 2009 07:40:59 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754934AbZJZHkG (ORCPT ); Mon, 26 Oct 2009 03:40:06 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754961AbZJZHkG (ORCPT ); Mon, 26 Oct 2009 03:40:06 -0400 Received: from Cpsmtpm-eml106.kpnxchange.com ([195.121.3.10]:53799 "EHLO CPSMTPM-EML106.kpnxchange.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754892AbZJZHjE (ORCPT ); Mon, 26 Oct 2009 03:39:04 -0400 Received: from elrond.fjphome.nl ([77.166.180.99]) by CPSMTPM-EML106.kpnxchange.com with Microsoft SMTPSVC(7.0.6001.18000); Mon, 26 Oct 2009 08:39:06 +0100 Received: from aragorn.fjphome.nl ([10.19.66.13]) by elrond.fjphome.nl with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.69) (envelope-from ) id 1N2KAT-0007j4-Gz; Mon, 26 Oct 2009 08:39:05 +0100 Received: from fjp by aragorn.fjphome.nl with local (Exim 4.69) (envelope-from ) id 1N2KAT-0006vC-87; Mon, 26 Oct 2009 08:39:05 +0100 From: Frans Pop To: linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org Cc: akpm@linux-foundation.org, Frans Pop , Zhang Rui Subject: [PATCH 5/6] thermal: Only set passive_delay for forced_passive cooling Date: Mon, 26 Oct 2009 08:39:03 +0100 Message-Id: <1256542744-26569-6-git-send-email-elendil@planet.nl> X-Mailer: git-send-email 1.5.6.5 In-Reply-To: <1256542744-26569-1-git-send-email-elendil@planet.nl> References: <1256542744-26569-1-git-send-email-elendil@planet.nl> X-OriginalArrivalTime: 26 Oct 2009 07:39:06.0127 (UTC) FILETIME=[658629F0:01CA560F] Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org diff --git a/drivers/thermal/thermal_sys.c b/drivers/thermal/thermal_sys.c index 74d2eb5..fc5e92e 100644 --- a/drivers/thermal/thermal_sys.c +++ b/drivers/thermal/thermal_sys.c @@ -241,6 +241,8 @@ passive_store(struct device *dev, struct device_attribute *attr, cdev); } mutex_unlock(&thermal_list_lock); + if (!tz->passive_delay) + tz->passive_delay = 1000; } else if (!state && tz->forced_passive) { mutex_lock(&thermal_list_lock); list_for_each_entry(cdev, &thermal_cdev_list, node) { @@ -251,17 +253,12 @@ passive_store(struct device *dev, struct device_attribute *attr, cdev); } mutex_unlock(&thermal_list_lock); + tz->passive_delay = 0; } tz->tc1 = 1; tz->tc2 = 1; - if (!tz->passive_delay) - tz->passive_delay = 1000; - - if (!tz->polling_delay) - tz->polling_delay = 10000; - tz->forced_passive = state; thermal_zone_device_update(tz);