diff --git a/CHANGES b/CHANGES index a4a63ae6..647efc84 100644 --- a/CHANGES +++ b/CHANGES @@ -6,6 +6,7 @@ SVN-HEAD Fix sysfs presence detection Don't choke on unrecognized devices (#2087) Fix lm93 vid2 access (#2295) + No in1 on w83783s Makefile: Revert changeset 4738, fix bug #2187 differently Module adm1026: Various cleanups Module eeprom: Hide Sony Vaio serial numbers to regular users (2.6 backport) @@ -31,6 +32,7 @@ SVN-HEAD Program sensord: Add lm85 support Program sensors: Hide spurious errors on missing f71872f voltage inputs Hide spurious errors on missing adm1026 inputs + Fix W83783S prefix matching Program sensors-detect: Add Texas Instruments TMP401 detection Mention the f75375s driver Add SMSC LPC47B367-NC detection (no sensors) diff --git a/lib/chips.c b/lib/chips.c index 62358c4f..e7c08eba 100644 --- a/lib/chips.c +++ b/lib/chips.c @@ -1430,8 +1430,6 @@ static sensors_chip_feature w83783s_features[] = { { { SENSORS_W83783S_IN0, "in0", NOMAP, NOMAP, R }, W83781D_SYSCTL_IN0, VALUE(3), 2 }, - { { SENSORS_W83783S_IN1, "in1", NOMAP, NOMAP, R }, - W83781D_SYSCTL_IN1, VALUE(3), 2 }, { { SENSORS_W83783S_IN2, "in2", NOMAP, NOMAP, R }, W83781D_SYSCTL_IN2, VALUE(3), 2 }, { { SENSORS_W83783S_IN3, "in3", NOMAP, NOMAP, R }, @@ -1445,9 +1443,6 @@ static sensors_chip_feature w83783s_features[] = { { SENSORS_W83783S_IN0_MIN, "in0_min", SENSORS_W83783S_IN0, SENSORS_W83783S_IN0, RW }, W83781D_SYSCTL_IN0, VALUE(1), 2 }, - { { SENSORS_W83783S_IN1_MIN, "in1_min", SENSORS_W83783S_IN1, - SENSORS_W83783S_IN1, RW }, - W83781D_SYSCTL_IN1, VALUE(1), 2 }, { { SENSORS_W83783S_IN2_MIN, "in2_min", SENSORS_W83783S_IN2, SENSORS_W83783S_IN2, RW }, W83781D_SYSCTL_IN2, VALUE(1), 2 }, @@ -1466,9 +1461,6 @@ static sensors_chip_feature w83783s_features[] = { { SENSORS_W83783S_IN0_MAX, "in0_max", SENSORS_W83783S_IN0, SENSORS_W83783S_IN0, RW }, W83781D_SYSCTL_IN0, VALUE(2), 2 }, - { { SENSORS_W83783S_IN1_MAX, "in1_max", SENSORS_W83783S_IN1, - SENSORS_W83783S_IN1, RW }, - W83781D_SYSCTL_IN1, VALUE(2), 2 }, { { SENSORS_W83783S_IN2_MAX, "in2_max", SENSORS_W83783S_IN2, SENSORS_W83783S_IN2, RW }, W83781D_SYSCTL_IN2, VALUE(2), 2 }, diff --git a/prog/sensors/main.c b/prog/sensors/main.c index e3031ab7..fa5bf9e5 100644 --- a/prog/sensors/main.c +++ b/prog/sensors/main.c @@ -362,7 +362,7 @@ static struct match matches[] = { { "adm1024", print_adm1024 }, { "w83781d", print_w83781d }, { "w83782d", print_w83781d }, - { "w83783d", print_w83781d }, + { "w83783s", print_w83781d }, { "w83627hf", print_w83781d }, { "w83627thf", print_w83781d }, { "w83637hf", print_w83781d },