summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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 383de56..cd5f34b 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 */
OpenPOWER on IntegriCloud