hwmon: (abituguru3) Fix I/O error handling
authorJean Delvare <khali@linux-fr.org>
Thu, 12 Mar 2009 12:36:38 +0000 (13:36 +0100)
committerJean Delvare <khali@linux-fr.org>
Thu, 12 Mar 2009 12:36:38 +0000 (13:36 +0100)
Fix a logic bug reported by Roel Kluin, by rewriting the error
handling code in a clearer way.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Cc: Roel Kluin <roel.kluin@gmail.com>
Acked-by: Alistair John Strachan <alistair@devzero.co.uk>
Acked-by: Hans de Goede <hdegoede@redhat.com>
drivers/hwmon/abituguru3.c

index e52b388..ad2b343 100644 (file)
@@ -760,8 +760,11 @@ static int abituguru3_read_increment_offset(struct abituguru3_data *data,
 
        for (i = 0; i < offset_count; i++)
                if ((x = abituguru3_read(data, bank, offset + i, count,
-                               buf + i * count)) != count)
-                       return i * count + (i && (x < 0)) ? 0 : x;
+                               buf + i * count)) != count) {
+                       if (x < 0)
+                               return x;
+                       return i * count + x;
+               }
 
        return i * count;
 }