[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <1241657280.15284.107.camel@rzhang-dt>
Date: Thu, 07 May 2009 08:48:00 +0800
From: Zhang Rui <rui.zhang@...el.com>
To: Vladimir Zajac <eightgraph@...il.com>
Cc: "linux-acpi@...r.kernel.org" <linux-acpi@...r.kernel.org>,
"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>
Subject: Re: [PATCH 2.6.30-rc4] thermal: fix off-by-1 error in trip point
trigger condition
On Thu, 2009-05-07 at 01:34 +0800, Vladimir Zajac wrote:
> This patch fixes a regression caused by commit
> b1569e99c795bf83b4ddf41c4f1c42761ab7f75e
> "ACPI: move thermal trip handling to generic thermal layer"
> which accidentally changed trip point trigger condition to
> temp > trip_temp
>
> This patch changes the trigger condition back to
> temp >= trip_temp
>
> Signed-off-by: Vladimir Zajac <eightgraph@...il.com>
Acked-by: Zhang Rui <rui.zhang@...el.com>
> ---
>
> thermal_sys.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> --- linux-2.6.30-rc4/drivers/thermal/thermal_sys.c 2009-04-30 23:52:59.000000000 +0200
> +++ linux-2.6.30-rc4-p1/drivers/thermal/thermal_sys.c 2009-05-04 19:58:30.000000000 +0200
> @@ -961,7 +961,7 @@ void thermal_zone_device_update(struct t
>
> switch (trip_type) {
> case THERMAL_TRIP_CRITICAL:
> - if (temp > trip_temp) {
> + if (temp >= trip_temp) {
> if (tz->ops->notify)
> ret = tz->ops->notify(tz, count,
> trip_type);
> @@ -974,7 +974,7 @@ void thermal_zone_device_update(struct t
> }
> break;
> case THERMAL_TRIP_HOT:
> - if (temp > trip_temp)
> + if (temp >= trip_temp)
> if (tz->ops->notify)
> tz->ops->notify(tz, count, trip_type);
> break;
> @@ -986,14 +986,14 @@ void thermal_zone_device_update(struct t
>
> cdev = instance->cdev;
>
> - if (temp > trip_temp)
> + if (temp >= trip_temp)
> cdev->ops->set_cur_state(cdev, 1);
> else
> cdev->ops->set_cur_state(cdev, 0);
> }
> break;
> case THERMAL_TRIP_PASSIVE:
> - if (temp > trip_temp || tz->passive)
> + if (temp >= trip_temp || tz->passive)
> thermal_zone_device_passive(tz, temp,
> trip_temp, count);
> break;
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists