Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-04-25 06:46:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

mxc_i2c: call i2c_imx_stop on error in i2c_read/i2c_write

Browse source 
Signed-off-by: Troy Kisky <troy.kisky@boundarydevices.com>
This commit is contained in:
Troy Kisky 2012-07-19 08:18:07 +00:00 • committed by Heiko Schocher
parent b230ddc267
commit c4330d283c
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
drivers/i2c/mxc_i2c.c
View file

@ -337,8 +337,10 @@ int i2c_read(uchar chip, uint addr, int alen, uchar *buf, int len)
writeb(temp, &i2c_regs->i2cr); writeb(temp, &i2c_regs->i2cr);
ret = tx_byte(i2c_regs, (chip << 1) | 1); ret = tx_byte(i2c_regs, (chip << 1) | 1);
if (ret < 0) if (ret < 0) {
i2c_imx_stop();
return ret; return ret;
}
/* setup bus to read data */ /* setup bus to read data */
temp = readb(&i2c_regs->i2cr); temp = readb(&i2c_regs->i2cr);
@ -352,8 +354,10 @@ int i2c_read(uchar chip, uint addr, int alen, uchar *buf, int len)
/* read data */ /* read data */
for (i = 0; i < len; i++) { for (i = 0; i < len; i++) {
ret = i2c_imx_trx_complete(); ret = i2c_imx_trx_complete();
if (ret) if (ret) {
i2c_imx_stop();
return ret; return ret;
}
/* /*
* It must generate STOP before read I2DR to prevent * 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++) { for (i = 0; i < len; i++) {
ret = tx_byte(i2c_regs, buf[i]); ret = tx_byte(i2c_regs, buf[i]);
if (ret < 0) if (ret < 0)
return ret; break;
} }
i2c_imx_stop(); i2c_imx_stop();