From e120a5b0cfd478eafdf5bbe1390570a7c2f2bee2 Mon Sep 17 00:00:00 2001
From: Dan Williams <dan.j.williams@gmail.com>
Date: Tue, 1 Nov 2005 22:31:12 +0000
Subject: [PATCH] --- yaml --- r: 12103 b: refs/heads/master c:
 fbd9a6d7a927b2059d1d65441384ffb095f68e58 h: refs/heads/master i:   12101:
 b69cf656f2935e39d66499b6e820485ba6d5630c   12099:
 ed4a979aefeaa1be523f047a994d0da068782d7a   12095:
 4d326735d09d799f9909ecb8b70e140783c7776d v: v3

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

diff --git a/[refs] b/[refs]
index db129ba57c5e..f47d6718b8e9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d01e8897fcf597f62d84f626fdced8d94c70deaf
+refs/heads/master: fbd9a6d7a927b2059d1d65441384ffb095f68e58
diff --git a/trunk/drivers/i2c/busses/i2c-iop3xx.c b/trunk/drivers/i2c/busses/i2c-iop3xx.c
index 9888fae1f37a..53c649445102 100644
--- a/trunk/drivers/i2c/busses/i2c-iop3xx.c
+++ b/trunk/drivers/i2c/busses/i2c-iop3xx.c
@@ -11,7 +11,7 @@
  *
  * Copyright (C) 1995-1997 Simon G. Vogl, 1998-2000 Hans Berglund
  *  
- * And which acknowledged Kyösti Mälkki <kmalkki@cc.hut.fi>,
+ * And which acknowledged Kyösti Mälkki <kmalkki@cc.hut.fi>,
  * Frodo Looijaard <frodol@dds.nl>, Martin Bailey<mbailey@littlefeet-inc.com>
  *
  * Major cleanup by Deepak Saxena <dsaxena@plexity.net>, 01/2005:
@@ -184,7 +184,7 @@ iop3xx_i2c_wait_event(struct i2c_algo_iop3xx_data *iop3xx_adap,
 	do {
 		interrupted = wait_event_interruptible_timeout (
 			iop3xx_adap->waitq,
-			(done = compare( sr = iop3xx_i2c_get_srstat(iop3xx_adap)					,flags )),
+			(done = compare( sr = iop3xx_i2c_get_srstat(iop3xx_adap) ,flags )),
 			1 * HZ;
 			);
 		if ((rc = iop3xx_i2c_error(sr)) < 0) {
@@ -472,9 +472,10 @@ iop3xx_i2c_probe(struct device *dev)
 		goto release_region;
 	}
 
-	res = request_irq(platform_get_irq(pdev, 0), iop3xx_i2c_irq_handler, 0, 
+	ret = request_irq(platform_get_irq(pdev, 0), iop3xx_i2c_irq_handler, 0,
 				pdev->name, adapter_data);
-	if (res) {
+
+	if (ret) {
 		ret = -EIO;
 		goto unmap;
 	}