summaryrefslogtreecommitdiff
path: root/drivers/hwmon
diff options
context:
space:
mode:
authorHans de Goede <j.w.r.degoede@hhs.nl>2007-07-24 23:36:00 +0200
committerMark M. Hoffman <mhoffman@lightlink.com>2007-07-30 21:05:07 -0400
commitacf346a311588e4cb659c183b9e312fa313dbb7f (patch)
tree696f923c001deabca50d7ee7ed8377964ebfb706 /drivers/hwmon
parentf08a34874f93d5081c735ffcb2f9071be9b5d270 (diff)
downloadlinux-3.10-acf346a311588e4cb659c183b9e312fa313dbb7f.tar.gz
linux-3.10-acf346a311588e4cb659c183b9e312fa313dbb7f.tar.bz2
linux-3.10-acf346a311588e4cb659c183b9e312fa313dbb7f.zip
hwmon: fix lm78 detection regression
Here is a small but important bugfix to the lm78 driver. I found out about this problem because a Fedora user filed a bug that the lm78 driver no longer worked on his system: https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=249428 The problem is that sometime ago the isa lm78 detection was made more stringent and this new code now checks the chip-id, but does not accept a chip-id of 20h, however a chip-id of 20h is valid, and is excepted in the main probe function of the driver, see line 551. This fixed also makes the isa detection code accept the chip-id of 0x20 fixing this issue. Signed-off-by: Hans de Goede <j.w.r.degoede@hhs.nl> Signed-off-by: Mark M. Hoffman <mhoffman@lightlink.com>
Diffstat (limited to 'drivers/hwmon')
-rw-r--r--drivers/hwmon/lm78.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/hwmon/lm78.c b/drivers/hwmon/lm78.c
index 9fb572f03ba..565c4e679b8 100644
--- a/drivers/hwmon/lm78.c
+++ b/drivers/hwmon/lm78.c
@@ -864,7 +864,7 @@ static int __init lm78_isa_found(unsigned short address)
/* Determine the chip type */
outb_p(LM78_REG_CHIPID, address + LM78_ADDR_REG_OFFSET);
val = inb_p(address + LM78_DATA_REG_OFFSET);
- if (val == 0x00 /* LM78 */
+ if (val == 0x00 || val == 0x20 /* LM78 */
|| val == 0x40 /* LM78-J */
|| (val & 0xfe) == 0xc0) /* LM79 */
found = 1;