diff --git a/drivers/i2c/i2c-imx.c b/drivers/i2c/i2c-imx.c
index 387c598..14d5260 100644
--- a/drivers/i2c/i2c-imx.c
+++ b/drivers/i2c/i2c-imx.c
@@ -177,8 +177,6 @@
 			dev_err(adapter->dev, "<%s> TXR timeout\n", __func__);
 			return -EIO;
 		}
-
-		writeb(0x0, base + IMX_I2C_I2SR);
 	}
 
 	return 0;
@@ -360,6 +358,9 @@
 		"<%s> write slave address: addr=0x%02x\n",
 		__func__, (msgs->addr << 1) | 0x01);
 
+	/* clear IIF */
+	writeb(0x0, base + IMX_I2C_I2SR);
+
 	/* write slave address */
 	writeb((msgs->addr << 1) | 0x01, base + IMX_I2C_I2DR);