From 02e2a549d61895f072d07dca0bed2888369b9e7e Mon Sep 17 00:00:00 2001
From: Wolfram Sang <w.sang@pengutronix.de>
Date: Mon, 6 Apr 2009 16:27:45 +0200
Subject: [PATCH] --- yaml --- r: 142671 b: refs/heads/master c:
 65de394df21f8ccc61525f77b0e4ee6940a0932e h: refs/heads/master i:   142669:
 f12ae5cb55160f9e021067562bb5a458bd56e9c3   142667:
 b5645498d6758e47e0a274c61afb7800a9a97e1a   142663:
 e1155718c5b01f989079bfd5bc8137100b3ce003   142655:
 6d910146fca73f4fbbec0a71ee74a863ccca0e98 v: v3

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

diff --git a/[refs] b/[refs]
index e6f7d0bab7fe..4ba52a794191 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b486ddbc0fb8127ccf2c820cfbf0b98e6f8a4e97
+refs/heads/master: 65de394df21f8ccc61525f77b0e4ee6940a0932e
diff --git a/trunk/drivers/i2c/busses/i2c-imx.c b/trunk/drivers/i2c/busses/i2c-imx.c
index 433d3486de04..0b486a63460d 100644
--- a/trunk/drivers/i2c/busses/i2c-imx.c
+++ b/trunk/drivers/i2c/busses/i2c-imx.c
@@ -86,8 +86,6 @@
 /** Variables ******************************************************************
 *******************************************************************************/
 
-static unsigned int disable_delay;	/* Dummy delay */
-
 /*
  * sorted list of clock divider, register value pairs
  * taken from table 26-5, p.26-9, Freescale i.MX
@@ -121,6 +119,7 @@ struct imx_i2c_struct {
 	int			irq;
 	wait_queue_head_t	queue;
 	unsigned long		i2csr;
+	unsigned int 		disable_delay;
 };
 
 /** Functions for IMX I2C adapter driver ***************************************
@@ -212,7 +211,7 @@ static void i2c_imx_stop(struct imx_i2c_struct *i2c_imx)
 	 * This delay caused by an i.MXL hardware bug.
 	 * If no (or too short) delay, no "STOP" bit will be generated.
 	 */
-	udelay(disable_delay);
+	udelay(i2c_imx->disable_delay);
 	/* Disable I2C controller */
 	writeb(0, i2c_imx->base + IMX_I2C_I2CR);
 }
@@ -243,7 +242,7 @@ static void __init i2c_imx_set_clk(struct imx_i2c_struct *i2c_imx,
 	 * This delay is used in I2C bus disable function
 	 * to fix chip hardware bug.
 	 */
-	disable_delay = (500000U * i2c_clk_div[i][0]
+	i2c_imx->disable_delay = (500000U * i2c_clk_div[i][0]
 		+ (i2c_clk_rate / 2) - 1) / (i2c_clk_rate / 2);
 
 	/* dev_dbg() can't be used, because adapter is not yet registered */