summaryrefslogtreecommitdiffstats
path: root/drivers/hwmon
diff options
context:
space:
mode:
authorGuillaume Chazarain <guichaz@yahoo.fr>2007-07-27 01:04:22 +0200
committerMark M. Hoffman <mhoffman@lightlink.com>2007-07-30 21:10:34 -0400
commitf5744e3775171b8deb2164577d3861968e33f72e (patch)
treef55f36f38c84acb457fdadf39cf1636170855866 /drivers/hwmon
parent1bed24b9785f7f5255c120f194e98343b998f6ce (diff)
downloadkernel-crypto-f5744e3775171b8deb2164577d3861968e33f72e.tar.gz
kernel-crypto-f5744e3775171b8deb2164577d3861968e33f72e.tar.xz
kernel-crypto-f5744e3775171b8deb2164577d3861968e33f72e.zip
hwmon: Fix regression caused by typo in lm90.c
The commit http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commitdiff;h=32c82a934759b2c9939c9e25865c2d7d1204b9e8 broke lm90 for my (Asus V6VA) laptop. Before 2.6.23-rc1 and with the following patch, I get: [g ~]$ sensors max6657-i2c-0-4c Adapter: SMBus I801 adapter at 0400 M/B Temp: +64°C (low = +0°C, high = +127°C) CPU Temp: +78.9°C (low = +73.2°C, high = +88.2°C) M/B Crit: +105°C (hyst = +95°C) CPU Crit: +105°C (hyst = +95°C) Which regressed into: [g ~]$ sensors No sensors found! Make sure you loaded all the kernel drivers you need. Try sensors-detect to find out which these are. zsh: 2701 exit 1 sensors and dmesg contains: i2c-adapter i2c-0: Unsupported chip (man_id=0x4D, chip_id=0x4D). It seems to be a typo, as address 0X4F is mentionned nowhere else in the file, and my chip is actually at 0x4C. Signed-off-by: Guillaume Chazarain <guichaz@yahoo.fr> Signed-off-by: Jean Delvare <khali@linux-fr.org> Signed-off-by: Mark M. Hoffman <mhoffman@lightlink.com>
Diffstat (limited to 'drivers/hwmon')
-rw-r--r--drivers/hwmon/lm90.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/hwmon/lm90.c b/drivers/hwmon/lm90.c
index 48833fff492..af541d67245 100644
--- a/drivers/hwmon/lm90.c
+++ b/drivers/hwmon/lm90.c
@@ -585,7 +585,7 @@ static int lm90_detect(struct i2c_adapter *adapter, int address, int kind)
* those of the man_id register.
*/
if (chip_id == man_id
- && (address == 0x4F || address == 0x4D)
+ && (address == 0x4C || address == 0x4D)
&& (reg_config1 & 0x1F) == (man_id & 0x0F)
&& reg_convrate <= 0x09) {
kind = max6657;