Changeset 6058

Timestamp:

07/10/12 15:16:54 (11 months ago)

Author:

khali

Message:

libi2c: Properly propagate real error codes on read errors

Location:

i2c-tools/trunk

Files:

• CHANGES (modified) (1 diff)
• lib/smbus.c (modified) (11 diffs)

i2c-tools/trunk/CHANGES

@@ -10 +10 @@
   i2c-stub-from-dump: Be more tolerant on input dump format
   library: New libi2c library
+           Properly propagate real error codes on read errors
 
 3.1.0 (2011-12-04)

i2c-tools/trunk/lib/smbus.c

@@ -4 +4 @@
     Copyright (C) 1995-97 Simon G. Vogl
     Copyright (C) 1998-99 Frodo Looijaard <frodol@dds.nl>
+    Copyright (C) 2012    Jean Delvare <khali@linux-fr.org>
 
     This program is free software; you can redistribute it and/or modify
@@ -21 +22 @@
 */
 
+#include <errno.h>
 #include <i2c/smbus.h>
 #include <sys/ioctl.h>
@@ -39 +41 @@
 {
         struct i2c_smbus_ioctl_data args;
+        __s32 err;
 
         args.read_write = read_write;
@@ -44 +47 @@
         args.size = size;
         args.data = data;
-        return ioctl(file, I2C_SMBUS, &args);
+
+        err = ioctl(file, I2C_SMBUS, &args);
+        if (err == -1)
+                err = -errno;
+        return err;
 }
 
@@ -56 +63 @@
 {
         union i2c_smbus_data data;
-        if (i2c_smbus_access(file, I2C_SMBUS_READ, 0, I2C_SMBUS_BYTE, &data))
-                return -1;
-        else
-                return 0x0FF & data.byte;
+        int err;
+
+        err = i2c_smbus_access(file, I2C_SMBUS_READ, 0, I2C_SMBUS_BYTE, &data);
+        if (err < 0)
+                return err;
+
+        return 0x0FF & data.byte;
 }
 
@@ -71 +81 @@
 {
         union i2c_smbus_data data;
-        if (i2c_smbus_access(file, I2C_SMBUS_READ, command,
-                             I2C_SMBUS_BYTE_DATA, &data))
-                return -1;
-        else
-                return 0x0FF & data.byte;
+        int err;
+
+        err = i2c_smbus_access(file, I2C_SMBUS_READ, command,
+                               I2C_SMBUS_BYTE_DATA, &data);
+        if (err < 0)
+                return err;
+
+        return 0x0FF & data.byte;
 }
 
@@ -89 +102 @@
 {
         union i2c_smbus_data data;
-        if (i2c_smbus_access(file, I2C_SMBUS_READ, command,
-                             I2C_SMBUS_WORD_DATA, &data))
-                return -1;
-        else
-                return 0x0FFFF & data.word;
+        int err;
+
+        err = i2c_smbus_access(file, I2C_SMBUS_READ, command,
+                               I2C_SMBUS_WORD_DATA, &data);
+        if (err < 0)
+                return err;
+
+        return 0x0FFFF & data.word;
 }
 
@@ -119 +135 @@
 {
         union i2c_smbus_data data;
-        int i;
-        if (i2c_smbus_access(file, I2C_SMBUS_READ, command,
-                             I2C_SMBUS_BLOCK_DATA, &data))
-                return -1;
-        else {
-                for (i = 1; i <= data.block[0]; i++)
-                        values[i-1] = data.block[i];
-                return data.block[0];
-        }
+        int i, err;
+
+        err = i2c_smbus_access(file, I2C_SMBUS_READ, command,
+                               I2C_SMBUS_BLOCK_DATA, &data);
+        if (err < 0)
+                return err;
+
+        for (i = 1; i <= data.block[0]; i++)
+                values[i-1] = data.block[i];
+        return data.block[0];
 }
 
@@ -152 +169 @@
 {
         union i2c_smbus_data data;
-        int i;
-
-        if (length > 32)
-                length = 32;
-        data.block[0] = length;
-        if (i2c_smbus_access(file, I2C_SMBUS_READ, command,
-                             length == 32 ? I2C_SMBUS_I2C_BLOCK_BROKEN :
-                              I2C_SMBUS_I2C_BLOCK_DATA, &data))
-                return -1;
-        else {
-                for (i = 1; i <= data.block[0]; i++)
-                        values[i-1] = data.block[i];
-                return data.block[0];
-        }
+        int i, err;
+
+        if (length > 32)
+                length = 32;
+        data.block[0] = length;
+
+        err = i2c_smbus_access(file, I2C_SMBUS_READ, command,
+                               length == 32 ? I2C_SMBUS_I2C_BLOCK_BROKEN :
+                                I2C_SMBUS_I2C_BLOCK_DATA, &data);
+        if (err < 0)
+                return err;
+
+        for (i = 1; i <= data.block[0]; i++)
+                values[i-1] = data.block[i];
+        return data.block[0];
 }
 
@@ -187 +205 @@
 {
         union i2c_smbus_data data;
-        int i;
+        int i, err;
+
         if (length > 32)
                 length = 32;
@@ -193 +212 @@
                 data.block[i] = values[i-1];
         data.block[0] = length;
-        if (i2c_smbus_access(file, I2C_SMBUS_WRITE, command,
-                             I2C_SMBUS_BLOCK_PROC_CALL, &data))
-                return -1;
-        else {
-                for (i = 1; i <= data.block[0]; i++)
-                        values[i-1] = data.block[i];
-                return data.block[0];
-        }
-}
+
+        err = i2c_smbus_access(file, I2C_SMBUS_WRITE, command,
+                               I2C_SMBUS_BLOCK_PROC_CALL, &data);
+        if (err < 0)
+                return err;
+
+        for (i = 1; i <= data.block[0]; i++)
+                values[i-1] = data.block[i];
+        return data.block[0];
+}