From a3b422caf180e08ce052d5914cf5b19e2c246bc6 Mon Sep 17 00:00:00 2001 From: Jan Weitzel Date: Wed, 7 Dec 2011 11:50:16 -0800 Subject: [PATCH] --- yaml --- r: 286444 b: refs/heads/master c: 78e1cf42ee3efd2c3e8af0b97cf0a0a570cc0c1f h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/i2c/busses/i2c-omap.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 767a3adc4dc5..5a51269c1d31 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2727b1753934e154931d6b3bdf20c9b2398457a2 +refs/heads/master: 78e1cf42ee3efd2c3e8af0b97cf0a0a570cc0c1f diff --git a/trunk/drivers/i2c/busses/i2c-omap.c b/trunk/drivers/i2c/busses/i2c-omap.c index 257c1a52c8c4..e0733b776079 100644 --- a/trunk/drivers/i2c/busses/i2c-omap.c +++ b/trunk/drivers/i2c/busses/i2c-omap.c @@ -830,11 +830,9 @@ omap_i2c_isr(int this_irq, void *dev_id) ~(OMAP_I2C_STAT_RRDY | OMAP_I2C_STAT_RDR | OMAP_I2C_STAT_XRDY | OMAP_I2C_STAT_XDR)); - if (stat & OMAP_I2C_STAT_NACK) { + if (stat & OMAP_I2C_STAT_NACK) err |= OMAP_I2C_STAT_NACK; - omap_i2c_write_reg(dev, OMAP_I2C_CON_REG, - OMAP_I2C_CON_STP); - } + if (stat & OMAP_I2C_STAT_AL) { dev_err(dev->dev, "Arbitration lost\n"); err |= OMAP_I2C_STAT_AL;