[PATCH 3/8] i2c: omap: fix error checking
From: Felipe Balbi <hidden>
Date: 2012-10-22 09:46:53
Also in:
linux-i2c, linux-omap
Subsystem:
i2c subsystem, i2c subsystem host drivers, omap i2c driver, omap1 support, omap2+ support, the rest · Maintainers:
Andi Shyti, Vignesh R, Aaro Koskinen, Janusz Krzysztofik, Andreas Kemnade, Kevin Hilman, Roger Quadros, Tony Lindgren, Linus Torvalds
It's impossible to have Arbitration Lost, Read Overflow, and Tranmist Underflow all asserted at the same time. Those error conditions are mutually exclusive so what the code should be doing, instead, is check each error flag separataly. Signed-off-by: Felipe Balbi <redacted> --- drivers/i2c/busses/i2c-omap.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c
index bea0277..e0eab38 100644
--- a/drivers/i2c/busses/i2c-omap.c
+++ b/drivers/i2c/busses/i2c-omap.c@@ -587,9 +587,9 @@ static int omap_i2c_xfer_msg(struct i2c_adapter *adap, goto err_i2c_init; } - /* We have an error */ - if (dev->cmd_err & (OMAP_I2C_STAT_AL | OMAP_I2C_STAT_ROVR | - OMAP_I2C_STAT_XUDF)) { + if ((dev->cmd_err & OMAP_I2C_STAT_AL) + || (dev->cmd_err & OMAP_I2C_STAT_ROVR) + || (dev->cmd_err & OMAP_I2C_STAT_XUDF)) { ret = -EIO; goto err_i2c_init; }
--
1.8.0.rc0