From 9650e7e72aded729230f004ea774e9a3b9e4e513 Mon Sep 17 00:00:00 2001 From: Tomoya MORINAGA Date: Wed, 12 Oct 2011 13:13:05 +0900 Subject: [PATCH] --- yaml --- r: 272443 b: refs/heads/master c: cb59f5253a5313d62e8e345fcd5dd5a44a73e0d6 h: refs/heads/master i: 272441: d7d80e7bbc1e7187ff3ce6960de23989ada180e3 272439: 0c62694b4682af0328768eed368881b8cda46c31 v: v3 --- [refs] | 2 +- trunk/drivers/i2c/busses/i2c-eg20t.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 0ab1a691e310..94de54437143 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3cf21a7c48389c167065bffd61db39a9bd201f07 +refs/heads/master: cb59f5253a5313d62e8e345fcd5dd5a44a73e0d6 diff --git a/trunk/drivers/i2c/busses/i2c-eg20t.c b/trunk/drivers/i2c/busses/i2c-eg20t.c index 318e6a5a710f..a1bf62dbd27b 100644 --- a/trunk/drivers/i2c/busses/i2c-eg20t.c +++ b/trunk/drivers/i2c/busses/i2c-eg20t.c @@ -318,11 +318,13 @@ static s32 pch_i2c_wait_for_xfer_complete(struct i2c_algo_pch_data *adap) if (ret == 0) { pch_err(adap, "timeout: %x\n", adap->pch_event_flag); + adap->pch_event_flag = 0; return -ETIMEDOUT; } if (adap->pch_event_flag & I2C_ERROR_MASK) { pch_err(adap, "error bits set: %x\n", adap->pch_event_flag); + adap->pch_event_flag = 0; return -EIO; }