Changeset 2719 for lm-sensors/trunk/kernel/chips/lm87.c

Timestamp:

10/10/04 14:03:48 (9 years ago)

Author:

khali

Message:

Retry on read errors. Contributed by David Knierim.

Files:

• lm-sensors/trunk/kernel/chips/lm87.c (modified) (4 diffs)

lm-sensors/trunk/kernel/chips/lm87.c

@@ -28 +28 @@
 #include <linux/i2c-proc.h>
 #include <linux/init.h>
+#include <linux/delay.h>
 #include "version.h"
 #include "sensors_vid.h"
@@ -469 +470 @@
 
         if ((err = i2c_detach_client(client))) {
-                printk
-                    ("lm87.o: Client deregistration failed, client not detached.\n");
+                printk(KERN_ERR "lm87.o: Client deregistration failed, "
+                       "client not detached\n");
                 return err;
         }
@@ -479 +480 @@
 }
 
+#define MAX_RETRIES 5
+
 static int lm87_read_value(struct i2c_client *client, u8 reg)
 {
-        return 0xFF & i2c_smbus_read_byte_data(client, reg);
+        int value, i;
+
+        /* Retry in case of read errors */
+        for (i = 1; i <= MAX_RETRIES; i++) {
+                if ((value = i2c_smbus_read_byte_data(client, reg)) >= 0)
+                        return value;
+
+                printk(KERN_WARNING "lm87.o: Read byte data failed, "
+                       "address 0x%02x\n", reg);
+                mdelay(i);
+        }
+
+        /* <TODO> what to return in case of error? */
+        return 0;
 }
 
@@ -944 +960 @@
 static int __init sm_lm87_init(void)
 {
-        printk("lm87.o version %s (%s)\n", LM_VERSION, LM_DATE);
+        printk(KERN_INFO "lm87.o version %s (%s)\n", LM_VERSION, LM_DATE);
         return i2c_add_driver(&LM87_driver);
 }