From 22436faf3582f3f0d1e84db6ea2428e9abbccad6 Mon Sep 17 00:00:00 2001
From: Shubhrajyoti D <shubhrajyoti@ti.com>
Date: Tue, 6 Dec 2011 10:25:58 -0800
Subject: [PATCH] --- yaml --- r: 276803 b: refs/heads/master c:
 1d5a34fe990c9e2e2f672b238ad881d0d4ed376b h: refs/heads/master i:   276801:
 3981a2297ced11f8b69824608ac0338d06f45a54   276799:
 c0aa65c68afcab36c7d40b3797d3aef4b781e803 v: v3

---
 [refs]                              |  2 +-
 trunk/drivers/i2c/busses/i2c-omap.c | 11 ++++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 0606f75c8ac3..a714313f8145 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8ebe661dd2ab16e2e9c272ed5c86019c7407b9a1
+refs/heads/master: 1d5a34fe990c9e2e2f672b238ad881d0d4ed376b
diff --git a/trunk/drivers/i2c/busses/i2c-omap.c b/trunk/drivers/i2c/busses/i2c-omap.c
index a43d0023446a..fa23faa20f0e 100644
--- a/trunk/drivers/i2c/busses/i2c-omap.c
+++ b/trunk/drivers/i2c/busses/i2c-omap.c
@@ -1047,13 +1047,14 @@ omap_i2c_probe(struct platform_device *pdev)
 		 * size. This is to ensure that we can handle the status on int
 		 * call back latencies.
 		 */
-		if (dev->rev >= OMAP_I2C_REV_ON_3530_4430) {
-			dev->fifo_size = 0;
+
+		dev->fifo_size = (dev->fifo_size / 2);
+
+		if (dev->rev >= OMAP_I2C_REV_ON_3530_4430)
 			dev->b_hw = 0; /* Disable hardware fixes */
-		} else {
-			dev->fifo_size = (dev->fifo_size / 2);
+		else
 			dev->b_hw = 1; /* Enable hardware fixes */
-		}
+
 		/* calculate wakeup latency constraint for MPU */
 		if (dev->set_mpu_wkup_lat != NULL)
 			dev->latency = (1000000 * dev->fifo_size) /