diff --git a/CHANGES b/CHANGES
index 00b80fd..66cddbe 100644
--- a/CHANGES
+++ b/CHANGES
@@ -7,6 +7,7 @@ SVN
   decode-vaio: Private data might not be readable by non-root users
                Print the asset tag
                Fix the timestamp decoding
+  i2cdump: Fix I2C block mode error code
   i2cset: Final status messages go to stdout
           Return success even when readback fails or doesn't match
   i2c-stub-from-dump: New helper script to use with i2c-stub
diff --git a/tools/i2cdump.c b/tools/i2cdump.c
index d24d46d..8b0b86b 100644
--- a/tools/i2cdump.c
+++ b/tools/i2cdump.c
@@ -313,8 +313,10 @@ int main(int argc, char *argv[])
 				for (res = 0; res < 256; res += i) {
 					i = i2c_smbus_read_i2c_block_data(file,
 						res, 32, cblock + res);
-					if (i <= 0)
+					if (i <= 0) {
+						res = i;
 						break;
+					}
 				}
 			}
 			if (res <= 0) {