commit 24bea430d41b0a734be5e1022462836caba93dea
author Harini Jayaraman <harinij@codeaurora.org> Tue Oct 11 16:06:28 2011 -0600
committer Linux Build Service Account <lnxbuild@localhost> Wed Oct 12 22:09:38 2011 -0600
tree 38d7ee77ca98d4de1ea325d435e26b40a4d366d5
parent e60096da0f2e37010af610472b9df688a08f9c55

qup_i2c: Fix logical check on transaction flags

Change-Id: I2a45d1125ddf40a865a0d9a573f354428975062c
Signed-off-by: Harini Jayaraman <harinij@codeaurora.org>

drivers/i2c/busses/i2c-qup.c

diff --git a/drivers/i2c/busses/i2c-qup.c b/drivers/i2c/busses/i2c-qup.c
index c6bbb0d..00c7633 100644
--- a/drivers/i2c/busses/i2c-qup.c
+++ b/drivers/i2c/busses/i2c-qup.c
@@ -527,7 +527,7 @@
 		 */
 		if (rem > 1) {
 			struct i2c_msg *next = msg + 1;
-			if (next->addr == msg->addr && (next->flags | I2C_M_RD)
+			if (next->addr == msg->addr && (next->flags & I2C_M_RD)
 				&& *idx == ((dev->wr_sz*2) - 4)) {
 				writel_relaxed(((last_entry |
 					msg->buf[dev->pos]) |