From 0c62694b4682af0328768eed368881b8cda46c31 Mon Sep 17 00:00:00 2001 From: Tomoya MORINAGA Date: Wed, 12 Oct 2011 13:13:01 +0900 Subject: [PATCH] --- yaml --- r: 272439 b: refs/heads/master c: c7b41f3affc63644f398b5faa170b1f531b406a8 h: refs/heads/master i: 272437: c2116a25004ea088a136a2e19d03ec178eb72941 272435: 3835354cbe085e15232400090392c4edfaf381f2 272431: b9c7876783733f4aa8ab7156190f69c75508d25d v: v3 --- [refs] | 2 +- trunk/drivers/i2c/busses/i2c-eg20t.c | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 99e29b9d68a3..d778f0403862 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 93e4ad74da14c8d5564cfc0b57c40ca311e53d47 +refs/heads/master: c7b41f3affc63644f398b5faa170b1f531b406a8 diff --git a/trunk/drivers/i2c/busses/i2c-eg20t.c b/trunk/drivers/i2c/busses/i2c-eg20t.c index a4f76cb76c46..543d39c73c37 100644 --- a/trunk/drivers/i2c/busses/i2c-eg20t.c +++ b/trunk/drivers/i2c/busses/i2c-eg20t.c @@ -311,13 +311,9 @@ static void pch_i2c_start(struct i2c_algo_pch_data *adap) */ static s32 pch_i2c_wait_for_xfer_complete(struct i2c_algo_pch_data *adap) { - s32 ret; + long ret; ret = wait_event_timeout(pch_event, (adap->pch_event_flag != 0), msecs_to_jiffies(50)); - if (ret < 0) { - pch_err(adap, "timeout: %x\n", adap->pch_event_flag); - return ret; - } if (ret == 0) { pch_err(adap, "timeout: %x\n", adap->pch_event_flag);