Received: from milmhbs1.lsil.com (147.145.21.209) by coscas01.lsi.com
 (172.21.36.60) with Microsoft SMTP Server id 8.1.393.1; Mon, 12 Oct 2009
 20:55:21 -0600
Received: from mail1.lsil.com (mail1.lsil.com [147.145.40.21])	by
 milmhbs1.lsil.com (8.12.11/8.12.11) with ESMTP id n9D2tHv5025988	for
 <andy.sharp@lsi.com>; Mon, 12 Oct 2009 19:55:17 -0700
Received: from psmtp.com (na3sys009amx243.postini.com [74.125.149.127])	by
 mail1.lsil.com (8.12.11/8.12.11) with SMTP id n9D2tFMX013686	for
 <andy.sharp@lsi.com>; Mon, 12 Oct 2009 19:55:15 -0700 (PDT)
Received: from source ([78.24.191.182]) by na3sys009amx243.postini.com
 ([74.125.148.14]) with SMTP;	Tue, 13 Oct 2009 02:55:16 GMT
Received: from localhost.localdomain ([127.0.0.1]:45702 "EHLO
	eddie.linux-mips.org" rhost-flags-OK-OK-OK-FAIL) by ftp.linux-mips.org	with
 ESMTP id S1492012AbZJMCzO (ORCPT <rfc822;andy.sharp@lsi.com>);	Tue, 13 Oct
 2009 04:55:14 +0200
Received: with ECARTIS (v1.0.0; list linux-mips); Tue, 13 Oct 2009 04:54:56
 +0200 (CEST)
Received: from TYO201.gate.nec.co.jp ([202.32.8.193]:45535 "EHLO
	tyo201.gate.nec.co.jp" rhost-flags-OK-OK-OK-OK) by ftp.linux-mips.org	with
 ESMTP id S1491812AbZJMCx6 (ORCPT	<rfc822;linux-mips@linux-mips.org>); Tue, 13
 Oct 2009 04:53:58 +0200
Received: from relay21.aps.necel.com ([10.29.19.50])	by tyo201.gate.nec.co.jp
 (8.13.8/8.13.4) with ESMTP id n9D2rjrc012208;	Tue, 13 Oct 2009 11:53:48 +0900
 (JST)
Received: from realmbox31.aps.necel.com ([10.29.19.36] [10.29.19.36]) by
 relay21.aps.necel.com with ESMTP; Tue, 13 Oct 2009 11:53:48 +0900
Received: from [10.114.180.134] ([10.114.180.134] [10.114.180.134]) by
 mbox02.aps.necel.com with ESMTP; Tue, 13 Oct 2009 11:53:48 +0900
From: Shinya Kuribayashi <shinya.kuribayashi@necel.com>
To: "baruch@tkos.co.il" <baruch@tkos.co.il>, "linux-i2c@vger.kernel.org"
	<linux-i2c@vger.kernel.org>
CC: "ben-linux@fluff.org" <ben-linux@fluff.org>, "linux-mips@linux-mips.org"
	<linux-mips@linux-mips.org>, "linux-arm-kernel@lists.infradead.org"
	<linux-arm-kernel@lists.infradead.org>
Sender: "linux-mips-bounce@linux-mips.org" <linux-mips-bounce@linux-mips.org>
Date: Mon, 12 Oct 2009 20:53:56 -0600
Subject: [PATCH 15/16] i2c-designware: i2c_dw_xfer_msg: Mark as completed on
 an error
Thread-Topic: [PATCH 15/16] i2c-designware: i2c_dw_xfer_msg: Mark as
 completed on an error
Thread-Index: AcpLsJyqc0CzNoDAROSnKM/ECZ8m6w==
Message-ID: <4AD3EBC4.6030705@necel.com>
References: <4AD3E974.8080200@necel.com>
In-Reply-To: <4AD3E974.8080200@necel.com>
Accept-Language: en-US
Content-Language: en-US
X-MS-Exchange-Organization-AuthAs: Anonymous
X-MS-Exchange-Organization-AuthSource: coscas01.lsi.com
X-MS-Has-Attach:
X-Auto-Response-Suppress: All
X-MS-TNEF-Correlator:
x-scanned-by: MIMEDefang 2.39
errors-to: linux-mips-bounce@linux-mips.org
x-pstn-levels: (S:99.90000/99.90000 CV:99.9000 FC:95.5390 LC:95.5390
 R:95.9108 P:95.9108 M:97.0282 C:98.6951 )
x-pstn-settings: 3 (1.0000:1.0000) s cv gt3 gt2 gt1 r p m c 
x-pstn-addresses: from <shinya.kuribayashi@necel.com> [db-null] 
x-pstn-neptune: 1/1/1.00/75
user-agent: Thunderbird 2.0.0.23 (Windows/20090812)
Content-Type: text/plain; charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0

As wait_for_completion_interruptible_timeout() will be invoked after
the first call to i2c_dw_xfer_msg() is made whether or not an error is
detected in it, we need to mark ->cmd_complete as completed to avoid a
needless HZ timeout.

Signed-off-by: Shinya Kuribayashi <shinya.kuribayashi@necel.com>
---

 Or we could change the i2c_dw_xfer_msg() prototype from "void" to
 "int".  Which is preffered?

 drivers/i2c/busses/i2c-designware.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/drivers/i2c/busses/i2c-designware.c b/drivers/i2c/busses/i2c-d=
esignware.c
index f7ea032..6f85e28 100644
--- a/drivers/i2c/busses/i2c-designware.c
+++ b/drivers/i2c/busses/i2c-designware.c
@@ -376,6 +376,7 @@ i2c_dw_xfer_msg(struct dw_i2c_dev *dev)
 			dev_err(dev->dev,
 				"%s: invalid message length\n", __func__);
 			dev->msg_err =3D -EINVAL;
+			complete(&dev->cmd_complete);
 			return;
 		}
=20
--=20
1.6.5


