openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

i2c: mpc: report correct I2C error return codes 

This patch enforces correct I2C error returned codes from Freescale's
MPC i2c bus driver, allowing for proper user-space/kernel error
handling.

Signed-off-by: Danielle Costantino <danielle.costantino@gmail.com>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
This commit is contained in:
Danielle Costantino 2014-11-12 05:08:09 -08:00 committed by Wolfram Sang
parent 550d0407a8
commit ab0831d0f3
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/i2c/busses/i2c-mpc.c
View File

@ -124,7 +124,7 @@ static void mpc_i2c_fixup(struct mpc_i2c *i2c)
static int i2c_wait(struct mpc_i2c *i2c, unsigned timeout, int writing) static int i2c_wait(struct mpc_i2c *i2c, unsigned timeout, int writing)
{ {
unsigned long orig_jiffies = jiffies; unsigned long orig_jiffies = jiffies;
u32 x; u32 cmd_err;
int result = 0; int result = 0;
if (!i2c->irq) { if (!i2c->irq) {
@ -133,11 +133,11 @@ static int i2c_wait(struct mpc_i2c *i2c, unsigned timeout, int writing)
if (time_after(jiffies, orig_jiffies + timeout)) { if (time_after(jiffies, orig_jiffies + timeout)) {
dev_dbg(i2c->dev, "timeout\n"); dev_dbg(i2c->dev, "timeout\n");
writeccr(i2c, 0); writeccr(i2c, 0);
result = -EIO; result = -ETIMEDOUT;
break; break;
} }
} }
x = readb(i2c->base + MPC_I2C_SR); cmd_err = readb(i2c->base + MPC_I2C_SR);
writeb(0, i2c->base + MPC_I2C_SR); writeb(0, i2c->base + MPC_I2C_SR);
} else { } else {
/* Interrupt mode */ /* Interrupt mode */
@ -150,28 +150,28 @@ static int i2c_wait(struct mpc_i2c *i2c, unsigned timeout, int writing)
result = -ETIMEDOUT; result = -ETIMEDOUT;
} }
x = i2c->interrupt; cmd_err = i2c->interrupt;
i2c->interrupt = 0; i2c->interrupt = 0;
} }
if (result < 0) if (result < 0)
return result; return result;
if (!(x & CSR_MCF)) { if (!(cmd_err & CSR_MCF)) {
dev_dbg(i2c->dev, "unfinished\n"); dev_dbg(i2c->dev, "unfinished\n");
return -EIO; return -EIO;
} }
if (x & CSR_MAL) { if (cmd_err & CSR_MAL) {
dev_dbg(i2c->dev, "MAL\n"); dev_dbg(i2c->dev, "MAL\n");
return -EIO; return -EAGAIN;
} }
if (writing && (x & CSR_RXAK)) { if (writing && (cmd_err & CSR_RXAK)) {
dev_dbg(i2c->dev, "No RXAK\n"); dev_dbg(i2c->dev, "No RXAK\n");
/* generate stop */ /* generate stop */
writeccr(i2c, CCR_MEN); writeccr(i2c, CCR_MEN);
return -EIO; return -ENXIO;
} }
return 0; return 0;
} }