From e817653329e35ef6cc68201138ef76783920aec5 Mon Sep 17 00:00:00 2001 From: Jean Delvare Date: Tue, 30 Oct 2012 17:11:37 +0000 Subject: [PATCH] sensors-detect: Do not scan I2C adapters on graphics cards by default. Don't probe I2C buses on graphics cards by default. Their drivers will typically instantiate the I2C slave devices themselves as needed, and such probes have been occasionally reported to cause serious trouble. git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@6084 7894878c-1315-0410-8ee3-d5d059ff63e0 --- CHANGES | 1 + prog/detect/sensors-detect | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGES b/CHANGES index ff48b42a..650ec83b 100644 --- a/CHANGES +++ b/CHANGES @@ -11,6 +11,7 @@ SVN HEAD Avoid probing EDID addresses on graphics cards (#2386) Add detection of NCT6779D and NCT6102D/NCT6106D Add detection of SMSC LPC47N217 and SIO10N268 + Do not scan I2C adapters on graphics cards by default 3.3.2 (2012-03-14) libsensors: Added support for new sysfs attributes diff --git a/prog/detect/sensors-detect b/prog/detect/sensors-detect index df0e3015..4090fadc 100755 --- a/prog/detect/sensors-detect +++ b/prog/detect/sensors-detect @@ -3652,8 +3652,8 @@ sub scan_i2c_adapter my ($funcs, $chip, $addr, $class, $default, $input, @not_to_scan); $class = get_pci_class($i2c_adapters[$adapter_nr]->{parent}); - if (($class & 0xff00) == 0x0400) { - # Do not probe adapters on PCI multimedia cards by default + # Do not probe adapters on multimedia and graphics cards by default + if (($class & 0xff00) == 0x0400 || ($class & 0xff00) == 0x0300) { $default = 0; } elsif ($class == 0x0c01 || $class == 0x0c05 || find_i2c_adapter_driver($i2c_adapters[$adapter_nr]->{name})) {