diff mbox

i2c: mpc: Report correct I2C error codes on Freescale MPC i2c bus driver

Message ID CAAVjN7cpGzokOntyyGVBksdvAw7rGt8zvggpCeMqr+g1yHEyzg@mail.gmail.com
State Changes Requested
Headers show

Commit Message

Danielle Costantino Oct. 21, 2014, 7:05 a.m. UTC 
From: Danielle Costantino <danielle.costantino@gmail.com>

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>
---

Comments

Wolfram Sang Nov. 10, 2014, 2:49 p.m. UTC | #1 
On Tue, Oct 21, 2014 at 12:05:44AM -0700, Danielle Costantino wrote:
> From: Danielle Costantino <danielle.costantino@gmail.com>
> 
> 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>

Tabs converted to spaces here? Please resend properly.
diff mbox

Patch

diff --git a/drivers/i2c/busses/i2c-mpc.c b/drivers/i2c/busses/i2c-mpc.c
index 0edf630..66bef28 100644
--- a/drivers/i2c/busses/i2c-mpc.c
+++ b/drivers/i2c/busses/i2c-mpc.c
@@ -124,7 +124,7 @@ 
 static int i2c_wait(struct mpc_i2c *i2c, unsigned timeout, int writing)
 {
  unsigned long orig_jiffies = jiffies;
- u32 x;
+ u32 cmd_err;
  int result = 0;

  if (!i2c->irq) {
@@ -137,7 +137,7 @@ 
  break;
  }
  }
- x = readb(i2c->base + MPC_I2C_SR);
+ cmd_err = readb(i2c->base + MPC_I2C_SR);
  writeb(0, i2c->base + MPC_I2C_SR);
  } else {
  /* Interrupt mode */
@@ -150,30 +150,30 @@ 
  result = -ETIMEDOUT;
  }

- x = i2c->interrupt;
+ cmd_err = i2c->interrupt;
  i2c->interrupt = 0;
  }

- if (result < 0)
- return result;
+    if (result < 0)
+        return result;

- if (!(x & CSR_MCF)) {
- dev_dbg(i2c->dev, "unfinished\n");
- return -EIO;
- }
+    if (!(cmd_err & CSR_MCF)) {
+        dev_dbg(i2c->dev, "unfinished\n");
+        return -EIO;
+    }

- if (x & CSR_MAL) {
- dev_dbg(i2c->dev, "MAL\n");
- return -EIO;
- }
+    if (cmd_err & CSR_MAL) {
+        dev_dbg(i2c->dev, "MAL\n");
+        return -EAGAIN;
+    }

- if (writing && (x & CSR_RXAK)) {
- dev_dbg(i2c->dev, "No RXAK\n");
- /* generate stop */
- writeccr(i2c, CCR_MEN);
- return -EIO;
- }
- return 0;
+    if (writing && (cmd_err & CSR_RXAK)) {
+        dev_dbg(i2c->dev, "No RXAK\n");
+        /* generate stop */
+        writeccr(i2c, CCR_MEN);
+        return -ENXIO;
+    }
+    return 0;
 }

 #if defined(CONFIG_PPC_MPC52xx) || defined(CONFIG_PPC_MPC512x)