linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: bigeasy@linutronix.de (Sebastian Andrzej Siewior)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 5/6] i2c-pxa2xx: check timeout correctly
Date: Wed, 23 Feb 2011 12:38:19 +0100	[thread overview]
Message-ID: <1298461100-14869-6-git-send-email-bigeasy@linutronix.de> (raw)
In-Reply-To: <1298461100-14869-1-git-send-email-bigeasy@linutronix.de>

timeout here maybe 0 if the event occured and a task with a higher
priority stole the cpu and we were sleeping longer than the timeout
value we specified.
In case of a real timeout I changed the error code to I2C_RETRY so we
retry the transfer.

Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: Dirk Brandewie <dirk.brandewie@gmail.com>
---
 drivers/i2c/busses/i2c-pxa.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/drivers/i2c/busses/i2c-pxa.c b/drivers/i2c/busses/i2c-pxa.c
index e566f8c..bfd115d 100644
--- a/drivers/i2c/busses/i2c-pxa.c
+++ b/drivers/i2c/busses/i2c-pxa.c
@@ -770,8 +770,10 @@ static int i2c_pxa_do_xfer(struct pxa_i2c *i2c, struct i2c_msg *msg, int num)
 	 */
 	ret = i2c->msg_idx;
 
-	if (timeout == 0)
+	if (!timeout && i2c->msg_num) {
 		i2c_pxa_scream_blue_murder(i2c, "timeout");
+		ret = I2C_RETRY;
+	}
 
  out:
 	return ret;
-- 
1.7.4

  parent reply	other threads:[~2011-02-23 11:38 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-02-23 11:38 I2C support for CE4100, v3 Sebastian Andrzej Siewior
2011-02-23 11:38 ` [PATCH 1/6] i2c-pxa2xx: use dynamic register layout Sebastian Andrzej Siewior
2011-02-23 11:38 ` [PATCH 2/6] ARM: pxa2xx: reorganize I2C files Sebastian Andrzej Siewior
2011-03-02  0:49   ` Ben Dooks
2011-03-02  3:08     ` Eric Miao
2011-02-23 11:38 ` [PATCH 3/6] i2c-pxa2xx: Add PCI support for PXA I2C controller Sebastian Andrzej Siewior
2011-03-02  0:51   ` Ben Dooks
2011-03-02 10:26     ` [PATCH v2] " Sebastian Andrzej Siewior
2011-02-23 11:38 ` [PATCH 4/6] i2c-pxa2xx: add support for shared IRQ handler Sebastian Andrzej Siewior
2011-02-23 11:38 ` Sebastian Andrzej Siewior [this message]
2011-02-23 11:38 ` [PATCH 6/6] i2c-pxa2xx: pass of_node from platform driver to adapter and publish Sebastian Andrzej Siewior

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1298461100-14869-6-git-send-email-bigeasy@linutronix.de \
    --to=bigeasy@linutronix.de \
    --cc=linux-arm-kernel@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).