lkml.org 
[lkml]   [2004]   [Oct]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
SubjectRe: [PATCH] I2C update for 2.6.9
Date
From
ChangeSet 1.2071, 2004/10/19 15:20:59-07:00, R.Marek@sh.cvut.cz

[PATCH] I2C: fix it8712 detection

Following patch fixes the bug introduced by me in VID VRM patch.
Spotted (and later reviewed) by Jean Delvare. This bug is non-fatal,
it8712 will be just treated as it was before my VID VRM patch.

Tested on it8705 and it8712 hardware.

Signed-off-by: Rudolf Marek <r.marek@sh.cvut.cz>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>


drivers/i2c/chips/it87.c | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)


diff -Nru a/drivers/i2c/chips/it87.c b/drivers/i2c/chips/it87.c
--- a/drivers/i2c/chips/it87.c 2004-10-19 16:54:04 -07:00
+++ b/drivers/i2c/chips/it87.c 2004-10-19 16:54:04 -07:00
@@ -105,6 +105,10 @@
/* Reset the registers on init if true */
static int reset;

+/* Chip Type */
+
+static u16 chip_type;
+
/* Many IT87 constants specified below */

/* Length of ISA address segment */
@@ -592,9 +596,9 @@
u16 val;

superio_enter();
- val = (superio_inb(DEVID) << 8) |
+ chip_type = (superio_inb(DEVID) << 8) |
superio_inb(DEVID + 1);
- if (val != IT8712F_DEVID) {
+ if (chip_type != IT8712F_DEVID) {
superio_exit();
return -ENODEV;
}
@@ -691,11 +695,9 @@
if (kind <= 0) {
i = it87_read_value(new_client, IT87_REG_CHIPID);
if (i == 0x90) {
- u16 val;
kind = it87;
- val = (superio_inb(DEVID) << 8) |
- superio_inb(DEVID + 1);
- if (val == IT8712F_DEVID) kind = it8712;
+ if ((is_isa) && (chip_type == IT8712F_DEVID))
+ kind = it8712;
}
else {
if (kind == 0)
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

\
 
 \ /
  Last update: 2005-03-22 14:07    [W:0.149 / U:0.252 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site