diff options
| author | rpaulo <rpaulo@FreeBSD.org> | 2008-02-16 02:09:05 +0000 |
|---|---|---|
| committer | rpaulo <rpaulo@FreeBSD.org> | 2008-02-16 02:09:05 +0000 |
| commit | 8455c7d94a11143c69ce68c00ea1a2d3d30201f4 (patch) | |
| tree | bf1c48df81b802d65992f0f9d494cd182476dba3 | |
| parent | d37b92b2e9442aaaad1269b3df3dbb38429c3873 (diff) | |
| download | FreeBSD-src-8455c7d94a11143c69ce68c00ea1a2d3d30201f4.zip FreeBSD-src-8455c7d94a11143c69ce68c00ea1a2d3d30201f4.tar.gz | |
Allow the user to override the current active cooling state if state
is currently TZ_ACTIVE_NONE.
Submitted by: Andriy Gapon <avg at icyb.net.ua>
Reviewed by: njl (mentor)
Approved by: njl (mentor)
Requested by: njl (mentor)
MFC after: 3 days
| -rw-r--r-- | sys/dev/acpica/acpi_thermal.c | 3 |
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 */ |
