summaryrefslogtreecommitdiffstats
path: root/sys/dev/amdtemp
diff options
context:
space:
mode:
authoreadler <eadler@FreeBSD.org>2012-10-22 13:06:09 +0000
committereadler <eadler@FreeBSD.org>2012-10-22 13:06:09 +0000
commit92f340b6e7dc02801983812c792c7d3964d31ef7 (patch)
tree07e19b18864f030899e170c445daf41bd547c6d1 /sys/dev/amdtemp
parenta9d460420e5a6206b25b2ffac4bcaa0d37cc837a (diff)
downloadFreeBSD-src-92f340b6e7dc02801983812c792c7d3964d31ef7.zip
FreeBSD-src-92f340b6e7dc02801983812c792c7d3964d31ef7.tar.gz
This isn't functionally identical. In some cases a hint to disable
unit 0 would in fact disable all units. This reverts r241856 Approved by: cperciva (implicit)
Diffstat (limited to 'sys/dev/amdtemp')
-rw-r--r--sys/dev/amdtemp/amdtemp.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/sys/dev/amdtemp/amdtemp.c b/sys/dev/amdtemp/amdtemp.c
index 53714c6..6d106ae 100644
--- a/sys/dev/amdtemp/amdtemp.c
+++ b/sys/dev/amdtemp/amdtemp.c
@@ -185,6 +185,9 @@ amdtemp_probe(device_t dev)
{
uint32_t family, model;
+ if (resource_disabled("amdtemp", 0))
+ return (ENXIO);
+
family = CPUID_TO_FAMILY(cpu_id);
model = CPUID_TO_MODEL(cpu_id);
OpenPOWER on IntegriCloud