linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: vaibhav.hiremath@linaro.org (Vaibhav Hiremath)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH-V2 03/12] i2c: pxa: Return I2C_RETRY when timeout in pio mode
Date: Mon, 15 Jun 2015 21:19:50 +0530	[thread overview]
Message-ID: <1434383399-2370-4-git-send-email-vaibhav.hiremath@linaro.org> (raw)
In-Reply-To: <1434383399-2370-1-git-send-email-vaibhav.hiremath@linaro.org>

From: Shouming Wang <wangshm@marvell.com>

In case of timeout in pio mode of operation return I2C_RETRY.
This behavior will be same as interrupt mode of operation.

Signed-off-by: Shouming Wang <wangshm@marvell.com>
[vaibhav.hiremath at linaro.org: Updated changelog]
Signed-off-by: Vaibhav Hiremath <vaibhav.hiremath@linaro.org>
---
 drivers/i2c/busses/i2c-pxa.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/i2c/busses/i2c-pxa.c b/drivers/i2c/busses/i2c-pxa.c
index 023e59f..632008f 100644
--- a/drivers/i2c/busses/i2c-pxa.c
+++ b/drivers/i2c/busses/i2c-pxa.c
@@ -745,8 +745,10 @@ static int i2c_pxa_do_pio_xfer(struct pxa_i2c *i2c,
 	ret = i2c->msg_idx;
 
 out:
-	if (timeout == 0)
+	if (timeout == 0) {
 		i2c_pxa_scream_blue_murder(i2c, "timeout");
+		ret = I2C_RETRY;
+	}
 
 	return ret;
 }
-- 
1.9.1

  parent reply	other threads:[~2015-06-15 15:49 UTC|newest]

Thread overview: 51+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <vaibhav.hiremath@linaro.org>
2015-06-02 18:45 ` [PATCH-RESEND 0/3] i2c: core/pxa: Add support for hardware lock Vaibhav Hiremath
2015-06-02 18:45   ` [PATCH-RESEND 1/3] i2c: core: append hardware lock with bus lock Vaibhav Hiremath
2015-06-02 18:45   ` [PATCH-RESEND 2/3] i2c: pxa: Add support for hardware lock Vaibhav Hiremath
2015-06-02 18:45   ` [PATCH-RESEND 3/3] i2c: pxa: Add pin ctrl support for CP core access Vaibhav Hiremath
2015-06-16  8:28   ` [PATCH-RESEND 0/3] i2c: core/pxa: Add support for hardware lock Vaibhav Hiremath
2015-07-07  6:43     ` Vaibhav Hiremath
2015-10-25  9:52   ` Wolfram Sang
2015-06-15 15:49 ` [PATCH-V2 00/12] i2c: pxa: Fixes, cleanup and support for pxa910 family Vaibhav Hiremath
2015-06-15 15:49   ` [PATCH-V2 01/12] i2c: pxa: keep i2c irq ON in suspend Vaibhav Hiremath
2015-06-15 15:49   ` [PATCH-V2 02/12] i2c: pxa: No need to set slave addr for i2c master mode reset Vaibhav Hiremath
2015-07-03 20:58     ` Robert Jarzmik
2015-06-15 15:49   ` Vaibhav Hiremath [this message]
2015-06-16  5:31     ` [PATCH-V2 03/12] i2c: pxa: Return I2C_RETRY when timeout in pio mode Shubhrajyoti Datta
2015-06-16  7:41       ` Vaibhav Hiremath
2015-07-03 21:07     ` Robert Jarzmik
2015-06-15 15:49   ` [PATCH-V2 04/12] i2c: pxa: Reset i2c controller on timeout in interrupt and " Vaibhav Hiremath
2015-07-03 15:27     ` Robert Jarzmik
2015-07-03 18:13       ` Vaibhav Hiremath
2015-06-15 15:49   ` [PATCH-V2 05/12] i2c: pxa: Remove compile warnning in 64bit mode Vaibhav Hiremath
2015-06-15 15:49   ` [PATCH-V2 06/12] i2c: pxa: Update debug function to dump more info on error Vaibhav Hiremath
2015-06-15 15:49   ` [PATCH-V2 07/12] i2c:pxa: Use devm_ variants in probe function Vaibhav Hiremath
2015-07-03 15:28     ` Robert Jarzmik
2015-07-03 18:14       ` Vaibhav Hiremath
2015-06-15 15:49   ` [PATCH-V2 08/12] i2c: pxa: enable/disable i2c module across msg xfer Vaibhav Hiremath
2015-07-03 15:28     ` Robert Jarzmik
2015-07-03 18:23       ` Vaibhav Hiremath
2015-07-03 18:48         ` Vaibhav Hiremath
2015-07-03 19:44           ` Robert Jarzmik
2015-06-15 15:49   ` [PATCH-V2 09/12] Documentation: binding: add new property 'disable_after_xfer' to i2c-pxa Vaibhav Hiremath
2015-06-15 15:49   ` [PATCH-V2 10/12] i2c: pxa: Add support for pxa910/988 & new configuration features Vaibhav Hiremath
2015-06-15 15:49   ` [PATCH-V2 11/12] i2c: pxa: Add ILCR (tLow & tHigh) configuration support Vaibhav Hiremath
2015-07-03 15:28     ` Robert Jarzmik
2015-07-03 18:17       ` Vaibhav Hiremath
2015-06-15 15:49   ` [PATCH-V2 12/12] Documentation: binding: add sclk adjustment properties to i2c-pxa Vaibhav Hiremath
2015-06-16 13:22     ` Rob Herring
2015-06-16 14:25       ` Vaibhav Hiremath
2015-06-29  8:52   ` [PATCH-V2 00/12] i2c: pxa: Fixes, cleanup and support for pxa910 family Vaibhav Hiremath
2015-07-02 16:54     ` Vaibhav Hiremath
2015-06-17 18:58 ` [PATCH-v2 0/3] mfd: 88pm800: Add Device tree support Vaibhav Hiremath
2015-06-17 18:58   ` [PATCH-v2 1/3] mfd: 88pm800: Add device " Vaibhav Hiremath
2015-06-17 18:58   ` [PATCH-v2] rtc: 88pm80x: add " Vaibhav Hiremath
2015-06-20  0:43     ` [rtc-linux] " Alexandre Belloni
2015-06-25  7:46       ` Vaibhav Hiremath
2015-07-07  6:37         ` Vaibhav Hiremath
2015-06-17 18:58   ` [PATCH-v2 2/3] mfd: 88pm800: Allow configuration of interrupt clear method Vaibhav Hiremath
2015-06-17 18:58   ` [PATCH-v2 3/3] mfd: devicetree: bindings: Add new 88pm800 mfd binding Vaibhav Hiremath
2015-06-23 15:37     ` Rob Herring
2015-06-23 17:02       ` Vaibhav Hiremath
2015-06-24  0:29     ` Krzysztof Kozlowski
2015-06-24  5:19       ` Vaibhav Hiremath
2015-06-23  5:07   ` [PATCH-v2 0/3] mfd: 88pm800: Add Device tree support Vaibhav Hiremath

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=1434383399-2370-4-git-send-email-vaibhav.hiremath@linaro.org \
    --to=vaibhav.hiremath@linaro.org \
    --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).