From: Troy Kisky <troy.kisky@boundarydevices.com>
Date: Thu, 19 Jul 2012 08:18:07 +0000 (+0000)
Subject: mxc_i2c: call i2c_imx_stop on error in i2c_read/i2c_write
X-Git-Tag: v2012.10-rc1~415^2~28
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=c4330d283cefbd3574366e82910da3e918324b86;p=oweals%2Fu-boot.git

mxc_i2c: call i2c_imx_stop on error in i2c_read/i2c_write

Signed-off-by: Troy Kisky <troy.kisky@boundarydevices.com>
---

diff --git a/drivers/i2c/mxc_i2c.c b/drivers/i2c/mxc_i2c.c
index 4ce695a52d..55a688a802 100644
--- a/drivers/i2c/mxc_i2c.c
+++ b/drivers/i2c/mxc_i2c.c
@@ -337,8 +337,10 @@ int i2c_read(uchar chip, uint addr, int alen, uchar *buf, int len)
 	writeb(temp, &i2c_regs->i2cr);
 
 	ret = tx_byte(i2c_regs, (chip << 1) | 1);
-	if (ret < 0)
+	if (ret < 0) {
+		i2c_imx_stop();
 		return ret;
+	}
 
 	/* setup bus to read data */
 	temp = readb(&i2c_regs->i2cr);
@@ -352,8 +354,10 @@ int i2c_read(uchar chip, uint addr, int alen, uchar *buf, int len)
 	/* read data */
 	for (i = 0; i < len; i++) {
 		ret = i2c_imx_trx_complete();
-		if (ret)
+		if (ret) {
+			i2c_imx_stop();
 			return ret;
+		}
 
 		/*
 		 * It must generate STOP before read I2DR to prevent
@@ -395,7 +399,7 @@ int i2c_write(uchar chip, uint addr, int alen, uchar *buf, int len)
 	for (i = 0; i < len; i++) {
 		ret = tx_byte(i2c_regs, buf[i]);
 		if (ret < 0)
-			return ret;
+			break;
 	}
 
 	i2c_imx_stop();