From 0463b1174cdfe9bfda156e5adf255b1645e67f13 Mon Sep 17 00:00:00 2001
From: Jean Delvare <khali@linux-fr.org>
Date: Fri, 2 Sep 2005 21:25:47 +0200
Subject: [PATCH] --- yaml --- r: 7199 b: refs/heads/master c:
 d1b2f0a9754d3087ee29b3e88b8f20f2d30090d3 h: refs/heads/master i:   7197:
 f42e72c969b98d8223dadbac40ca96b5d50472d4   7195:
 bf4d93ca84adfb74204a7480c1a4fe285f42364f   7191:
 db16717f92119718778b57d8548df8f4a4f1956c   7183:
 63394e92f00240672356ebc69f184df8ad45a377   7167:
 4561ccd15ea6c93158b7673001941c678ccc34da v: v3

---
 [refs]                                 | 2 +-
 trunk/drivers/i2c/busses/i2c-mv64xxx.c | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index b02700c10b54..8610cab2bfef 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8e14d6c173f8fff05a94e62669c87c26141766af
+refs/heads/master: d1b2f0a9754d3087ee29b3e88b8f20f2d30090d3
diff --git a/trunk/drivers/i2c/busses/i2c-mv64xxx.c b/trunk/drivers/i2c/busses/i2c-mv64xxx.c
index eb6cc0869938..99abca45fece 100644
--- a/trunk/drivers/i2c/busses/i2c-mv64xxx.c
+++ b/trunk/drivers/i2c/busses/i2c-mv64xxx.c
@@ -423,13 +423,13 @@ static int
 mv64xxx_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msgs[], int num)
 {
 	struct mv64xxx_i2c_data *drv_data = i2c_get_adapdata(adap);
-	int	i, rc = 0;
+	int	i, rc;
 
 	for (i=0; i<num; i++)
-		if ((rc = mv64xxx_i2c_execute_msg(drv_data, &msgs[i])) != 0)
-			break;
+		if ((rc = mv64xxx_i2c_execute_msg(drv_data, &msgs[i])) < 0)
+			return rc;
 
-	return rc;
+	return num;
 }
 
 static struct i2c_algorithm mv64xxx_i2c_algo = {