From 7aacfbef8eec08a820df0879bcdf08b7bc3412a8 Mon Sep 17 00:00:00 2001 From: Moiz Sonasath Date: Thu, 20 Aug 2009 11:21:15 -0500 Subject: [PATCH] --- yaml --- r: 156979 b: refs/heads/master c: dd11976aea15bde53ce40b076dd5fa462c74f41a h: refs/heads/master i: 156977: 81f10658f058360de349d6bf66880ec5a9113134 156975: 3e089319e4877a0499e8ced6b598ef52a8deed14 v: v3 --- [refs] | 2 +- trunk/drivers/i2c/busses/i2c-omap.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 0eb5d776edfe..4ce3866cb328 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: dcc4ec26942d3bae2c5a82ab8346ab53b540a171 +refs/heads/master: dd11976aea15bde53ce40b076dd5fa462c74f41a diff --git a/trunk/drivers/i2c/busses/i2c-omap.c b/trunk/drivers/i2c/busses/i2c-omap.c index 94639d0aabd5..16b39f470a7c 100644 --- a/trunk/drivers/i2c/busses/i2c-omap.c +++ b/trunk/drivers/i2c/busses/i2c-omap.c @@ -694,6 +694,9 @@ omap_i2c_isr(int this_irq, void *dev_id) } if (stat & (OMAP_I2C_STAT_ARDY | OMAP_I2C_STAT_NACK | OMAP_I2C_STAT_AL)) { + omap_i2c_ack_stat(dev, stat & + (OMAP_I2C_STAT_RRDY | OMAP_I2C_STAT_RDR | + OMAP_I2C_STAT_XRDY | OMAP_I2C_STAT_XDR)); omap_i2c_complete_cmd(dev, err); return IRQ_HANDLED; }