Changeset 1427 for lm-sensors/trunk/kernel/busses/i2c-i810.c

Timestamp:

07/07/02 17:45:14 (11 years ago)

Author:

mds

Message:

flush PCI posted writes on algo-bit PCI drivers.

Also check return code on ioremap_nocache().

Files:

• lm-sensors/trunk/kernel/busses/i2c-i810.c (modified) (6 diffs)

lm-sensors/trunk/kernel/busses/i2c-i810.c

@@ -130 +130 @@
         outlong((val ? SCL_VAL_OUT : 0) | SCL_DIR | SCL_DIR_MASK | SCL_VAL_MASK,
              I810_GPIOB);
+        readlong(I810_GPIOB);   /* flush posted write */
 }
 
@@ -136 +137 @@
         outlong((val ? SDA_VAL_OUT : 0) | SDA_DIR | SDA_DIR_MASK | SDA_VAL_MASK,
              I810_GPIOB);
+        readlong(I810_GPIOB);   /* flush posted write */
 }
 
@@ -162 +164 @@
         outlong((val ? SCL_VAL_OUT : 0) | SCL_DIR | SCL_DIR_MASK | SCL_VAL_MASK,
              I810_GPIOA);
+        readlong(I810_GPIOA);   /* flush posted write */
 }
 
@@ -168 +171 @@
         outlong((val ? SDA_VAL_OUT : 0) | SDA_DIR | SDA_DIR_MASK | SDA_VAL_MASK,
              I810_GPIOA);
+        readlong(I810_GPIOA);   /* flush posted write */
 }
 
@@ -237 +241 @@
         cadr &= PCI_BASE_ADDRESS_MEM_MASK;
         mem = ioremap_nocache(cadr, 0x1000);
-        bit_i810i2c_setscl(NULL, 1);
-        bit_i810i2c_setsda(NULL, 1);
-        bit_i810ddc_setscl(NULL, 1);
-        bit_i810ddc_setsda(NULL, 1);
+        if(mem) {
+                bit_i810i2c_setscl(NULL, 1);
+                bit_i810i2c_setsda(NULL, 1);
+                bit_i810ddc_setscl(NULL, 1);
+                bit_i810ddc_setsda(NULL, 1);
+        }
 }
 
@@ -254 +260 @@
                                            *num++, dev))) {
                         config_i810(dev);
+                        if(!mem)
+                                return -ENOMEM;
                         printk("i2c-i810.o: i810/i815 found.\n");
                         return 0;