Changeset 3324

Timestamp:

07/19/99 01:41:28 (14 years ago)

Author:

frodo

Message:

First bugfix

'cat /proc/bus/i2c' no longer Oopses. I forgot to insert a block after
an if :-(

Files:

• i2c/trunk/kernel/i2c-core.c (modified) (4 diffs)

i2c/trunk/kernel/i2c-core.c

@@ -147 +147 @@
 };
 
-static int i2cproc_initialized;
+static int i2cproc_initialized = 0;
 
 
@@ -510 +510 @@
 #endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(2,1,29)) */
 {
-  int i;
-  int nr = 0;
-  /* Note that it is safe to write a `little' beyond len. Yes, really. */
-  for (i = 0; (i < I2C_ADAP_MAX) && (nr < len); i++)
-    if (adapters[i])
-      nr += sprintf(buf+nr, "i2c-%d\t", i2c_adapter_id(adapters[i]));
-      if (adapters[i]->algo->smbus_xfer) {
-        if (adapters[i]->algo->master_xfer)
-          nr += sprintf(buf+nr,"smbus/i2c");
-        else
-          nr += sprintf(buf+nr,"smbus    ");
-      } else if (adapters[i]->algo->master_xfer)
-         nr += sprintf(buf+nr,"i2c       ");
-      else
-         nr += sprintf(buf+nr,"dummy     ");
-      nr += sprintf(buf+nr,"\t%-32s\t%-32s\n",
-                    adapters[i]->name,
-                    adapters[i]->algo->name);
-  return nr;
+        int i;
+        int nr = 0;
+        /* Note that it is safe to write a `little' beyond len. Yes, really. */
+        for (i = 0; (i < I2C_ADAP_MAX) && (nr < len); i++)
+                if (adapters[i]) {
+                        nr += sprintf(buf+nr, "i2c-%d\t", i);
+                        if (adapters[i]->algo->smbus_xfer) {
+                                if (adapters[i]->algo->master_xfer)
+                                        nr += sprintf(buf+nr,"smbus/i2c");
+                                else
+                                        nr += sprintf(buf+nr,"smbus    ");
+                        } else if (adapters[i]->algo->master_xfer)
+                                nr += sprintf(buf+nr,"i2c       ");
+                        else
+                                nr += sprintf(buf+nr,"dummy     ");
+                        nr += sprintf(buf+nr,"\t%-32s\t%-32s\n",
+                                      adapters[i]->name,
+                                      adapters[i]->algo->name);
+                }
+        return nr;
 }
 
@@ -1115 +1116 @@
         adap_count=0;
         driver_count=0;
+
+        i2cproc_init();
         
         printk(KERN_INFO "i2c module initialized.\n");
@@ -1225 +1228 @@
 int init_module(void) 
 {
-        int res;
-        res = i2c_init();
-        if(!res)
-                res = i2cproc_init();
-        return res;     
+        return i2c_init();
 }