summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTroy Kisky <[email protected]>2012-07-19 08:18:02 +0000
committerHeiko Schocher <[email protected]>2012-07-31 07:40:59 +0200
commit1c076dba277fa35384b512841b0b284bdd579383 (patch)
tree83471cfd4f1b27ba0e1be9efb14a096d45b8cb63
parent8ec038a6a590c8ac66137502766ba10334c531e9 (diff)
mxc_i2c: fix i2c_imx_stop
Instead of clearing 2 bits, all the other bits were set because '|=' was used instead of '&='. Signed-off-by: Troy Kisky <[email protected]> Acked-by: Marek Vasut <[email protected]> Acked-by: Stefano Babic <[email protected]>
-rw-r--r--drivers/i2c/mxc_i2c.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/i2c/mxc_i2c.c b/drivers/i2c/mxc_i2c.c
index fc68062b118..c0c45fd36a1 100644
--- a/drivers/i2c/mxc_i2c.c
+++ b/drivers/i2c/mxc_i2c.c
@@ -264,7 +264,7 @@ void i2c_imx_stop(void)
/* Stop I2C transaction */
temp = readb(&i2c_regs->i2cr);
- temp |= ~(I2CR_MSTA | I2CR_MTX);
+ temp &= ~(I2CR_MSTA | I2CR_MTX);
writeb(temp, &i2c_regs->i2cr);
i2c_imx_bus_busy(0);