From: Ladislav Michl <ladis@linux-mips.org>
Date: Tue, 7 Feb 2006 03:45:38 +0000 (-0800)
Subject: [PATCH] ARM: OMAP: i2c-omap: Fix i2c_xfer for 1 msg
X-Git-Tag: v2.6.16-omap1~106
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=c9089b85d2bc8894fe6e465886ad0f427ef46d82;p=linux-2.6-omap-h63xx.git

[PATCH] ARM: OMAP: i2c-omap: Fix i2c_xfer for 1 msg

omap_i2c_xfer is supposed to return number of messages successfuly
transfered. Remove bogus condition which causes it to fail when
transfering one message.

Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
Signed-off-by: Tony Lindgren <tony@atomide.com>
---

diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c
index fb412559b8a..5572e5d467b 100644
--- a/drivers/i2c/busses/i2c-omap.c
+++ b/drivers/i2c/busses/i2c-omap.c
@@ -403,7 +403,7 @@ omap_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msgs[], int num)
 			break;
 	}
 
-	if (r == 0 && num > 1)
+	if (r == 0)
 		r = num;
 out:
 	omap_i2c_disable_clocks(dev);