From patchwork Mon Oct 26 07:39:04 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frans Pop X-Patchwork-Id: 55833 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 n9Q7ewqv008481 for ; Mon, 26 Oct 2009 07:40:59 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754996AbZJZHjh (ORCPT ); Mon, 26 Oct 2009 03:39:37 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754934AbZJZHjL (ORCPT ); Mon, 26 Oct 2009 03:39:11 -0400 Received: from Cpsmtpm-eml109.kpnxchange.com ([195.121.3.13]:60983 "EHLO CPSMTPM-EML109.kpnxchange.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754895AbZJZHjE (ORCPT ); Mon, 26 Oct 2009 03:39:04 -0400 Received: from elrond.fjphome.nl ([77.166.180.99]) by CPSMTPM-EML109.kpnxchange.com with Microsoft SMTPSVC(7.0.6001.18000); Mon, 26 Oct 2009 08:39:05 +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-0007j7-IK; Mon, 26 Oct 2009 08:39:05 +0100 Received: from fjp by aragorn.fjphome.nl with local (Exim 4.69) (envelope-from ) id 1N2KAT-0006vF-9X; 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 6/6] thermal: disable polling if passive_delay and polling_delay are both unset Date: Mon, 26 Oct 2009 08:39:04 +0100 Message-Id: <1256542744-26569-7-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:05.0880 (UTC) FILETIME=[65607980: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 fc5e92e..d69e6fd 100644 --- a/drivers/thermal/thermal_sys.c +++ b/drivers/thermal/thermal_sys.c @@ -1019,6 +1019,8 @@ void thermal_zone_device_update(struct thermal_zone_device *tz) thermal_zone_device_set_polling(tz, tz->passive_delay); else if (tz->polling_delay) thermal_zone_device_set_polling(tz, tz->polling_delay); + else + thermal_zone_device_set_polling(tz, 0); mutex_unlock(&tz->lock); } EXPORT_SYMBOL(thermal_zone_device_update);