From 03ef21e58bdc5b82a2696ec7a781b9afa5566eec Mon Sep 17 00:00:00 2001 From: "Mark D. Studebaker" Date: Fri, 5 May 2000 23:56:49 +0000 Subject: [PATCH] (mds) fixed normal_i2c_range declaration; bus was being scanned all the way to end of address range, which was hitting clock chip and hanging the bus. git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@796 7894878c-1315-0410-8ee3-d5d059ff63e0 --- CHANGES | 1 + kernel/chips/ddcmon.c | 2 +- kernel/chips/icspll.c | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGES b/CHANGES index 319f2dc3..f2967242 100644 --- a/CHANGES +++ b/CHANGES @@ -14,6 +14,7 @@ ask CVS about it: cvs diff -r V2-0-0 -r V2-0-1 -u 2.5.1 (2000????) + Module ddcmon: Fixed bus scan which could hang SMBus Module maxilife: Add support for Maxilife '99 (NBA) Module via686a: Enable sensors if not enabled by BIOS Module w83781d: Improve w83783s support diff --git a/kernel/chips/ddcmon.c b/kernel/chips/ddcmon.c index cb8cbe59..9fe3b5fa 100644 --- a/kernel/chips/ddcmon.c +++ b/kernel/chips/ddcmon.c @@ -40,7 +40,7 @@ /* Addresses to scan */ static unsigned short normal_i2c[] = { SENSORS_I2C_END }; -static unsigned short normal_i2c_range[] = { 0x50, SENSORS_I2C_END }; +static unsigned short normal_i2c_range[] = { 0x50, 0x50, SENSORS_I2C_END }; static unsigned int normal_isa[] = { SENSORS_ISA_END }; static unsigned int normal_isa_range[] = { SENSORS_ISA_END }; diff --git a/kernel/chips/icspll.c b/kernel/chips/icspll.c index f5256586..cc2427a8 100644 --- a/kernel/chips/icspll.c +++ b/kernel/chips/icspll.c @@ -51,7 +51,7 @@ /* Addresses to scan */ #define ADDRESS 0x69 static unsigned short normal_i2c[] = { SENSORS_I2C_END }; -static unsigned short normal_i2c_range[] = { ADDRESS, SENSORS_I2C_END }; +static unsigned short normal_i2c_range[] = {ADDRESS, ADDRESS, SENSORS_I2C_END}; static unsigned int normal_isa[] = { SENSORS_ISA_END }; static unsigned int normal_isa_range[] = { SENSORS_ISA_END };