i2c-eg20t: add stop sequence in case wait-event timeout occurs
authorTomoya MORINAGA <tomoya-linux@dsn.lapis-semi.com>
Wed, 12 Oct 2011 04:13:04 +0000 (13:13 +0900)
committerBen Dooks <ben-linux@fluff.org>
Sat, 29 Oct 2011 10:09:33 +0000 (11:09 +0100)
add stop sequence in case wait-event timeout in write processing.
(read processing already had it)

Signed-off-by: Tomoya MORINAGA <tomoya-linux@dsn.lapis-semi.com>
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
drivers/i2c/busses/i2c-eg20t.c

index cb29686..318e6a5 100644 (file)
@@ -456,6 +456,7 @@ static s32 pch_i2c_writebytes(struct i2c_adapter *i2c_adap,
                pch_clrbit(adap->pch_base_address, PCH_I2CSR, I2CMIF_BIT);
                return -EAGAIN;
        } else { /* wait-event timeout */
+               pch_i2c_stop(adap);
                return -ETIME;
        }
 
@@ -476,6 +477,7 @@ static s32 pch_i2c_writebytes(struct i2c_adapter *i2c_adap,
                        pch_clrbit(adap->pch_base_address, PCH_I2CSR,
                                   I2CMIF_BIT);
                } else { /* wait-event timeout */
+                       pch_i2c_stop(adap);
                        return -ETIME;
                }
        }
@@ -632,6 +634,7 @@ static s32 pch_i2c_readbytes(struct i2c_adapter *i2c_adap, struct i2c_msg *msgs,
                pch_clrbit(adap->pch_base_address, PCH_I2CSR, I2CMIF_BIT);
                return -EAGAIN;
        } else { /* wait-event timeout */
+               pch_i2c_stop(adap);
                return -ETIME;
        }