aboutsummaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorRui Paulo <rpaulo@FreeBSD.org>2008-02-16 02:09:05 +0000
committerRui Paulo <rpaulo@FreeBSD.org>2008-02-16 02:09:05 +0000
commit9e684e54fe6c6449efb5b62cb495066d4b83a218 (patch)
treebf1c48df81b802d65992f0f9d494cd182476dba3 /sys
parent6e1de64dcabc81fd6a3f2156949da398f8171ba9 (diff)
Notes
Diffstat (limited to 'sys')
-rw-r--r--sys/dev/acpica/acpi_thermal.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/sys/dev/acpica/acpi_thermal.c b/sys/dev/acpica/acpi_thermal.c
index 383de56310d7d..cd5f34bc53b13 100644
--- a/sys/dev/acpica/acpi_thermal.c
+++ b/sys/dev/acpica/acpi_thermal.c
@@ -528,7 +528,8 @@ acpi_tz_monitor(void *Context)
}
/* Handle user override of active mode */
- if (sc->tz_requested != TZ_ACTIVE_NONE && sc->tz_requested < newactive)
+ if (sc->tz_requested != TZ_ACTIVE_NONE && (newactive == TZ_ACTIVE_NONE
+ || sc->tz_requested < newactive))
newactive = sc->tz_requested;
/* update temperature-related flags */