From patchwork Tue Apr 14 19:16:45 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Garrett X-Patchwork-Id: 18208 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 n3EJHimJ030354 for ; Tue, 14 Apr 2009 19:17:44 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753088AbZDNTQ5 (ORCPT ); Tue, 14 Apr 2009 15:16:57 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752436AbZDNTQ5 (ORCPT ); Tue, 14 Apr 2009 15:16:57 -0400 Received: from cavan.codon.org.uk ([93.93.128.6]:43214 "EHLO vavatch.codon.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751814AbZDNTQ4 (ORCPT ); Tue, 14 Apr 2009 15:16:56 -0400 Received: from mjg59 by vavatch.codon.org.uk with local (Exim 4.69) (envelope-from ) id 1Lto7h-00025g-MX; Tue, 14 Apr 2009 20:16:45 +0100 Date: Tue, 14 Apr 2009 20:16:45 +0100 From: Matthew Garrett To: Alan Jenkins Cc: yakui_zhao , Zhang Rui , Alexey Starikovskiy , "linux-acpi@vger.kernel.org" , Linux Kernel Mailing List , Kernel Testers List Subject: [PATCH] thermal: Fix polling frequency for systems without passive cooling Message-ID: <20090414191645.GB7940@srcf.ucam.org> References: <49DF6835.9040501@tuffmail.co.uk> <49DFE345.3010109@gmail.com> <49E05F83.2090500@tuffmail.co.uk> <49E20EBA.2090708@tuffmail.co.uk> <1239588248.5564.19.camel@localhost.localdomain> <49E3085D.3060403@tuffmail.co.uk> <20090413170531.GA13188@srcf.ucam.org> <49E38779.9060705@tuffmail.co.uk> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <49E38779.9060705@tuffmail.co.uk> User-Agent: Mutt/1.5.12-2006-07-14 X-SA-Exim-Connect-IP: X-SA-Exim-Mail-From: mjg59@codon.org.uk X-SA-Exim-Scanned: No (on vavatch.codon.org.uk); SAEximRunCond expanded to false Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org The polling interval (in deciseconds) was accidently interpreted as being in milliseconds in one codepath, resulting in excessively frequent polling. Ensure that the conversion is performed. Signed-off-by: Matthew Garrett Acked-by: Zhang Rui diff --git a/drivers/acpi/thermal.c b/drivers/acpi/thermal.c index 9cd15e8..564ea14 100644 --- a/drivers/acpi/thermal.c +++ b/drivers/acpi/thermal.c @@ -909,7 +909,7 @@ static int acpi_thermal_register_thermal_zone(struct acpi_thermal *tz) thermal_zone_device_register("acpitz", trips, tz, &acpi_thermal_zone_ops, 0, 0, 0, - tz->polling_frequency); + tz->polling_frequency*100); if (IS_ERR(tz->thermal_zone)) return -ENODEV;