linux-i2c.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Ben Dooks <ben.dooks@codethink.co.uk>
To: linux-kernel@lists.codethink.co.uk
Cc: Ben Dooks <ben.dooks@codethink.co.uk>,
	Wolfram Sang <wsa@the-dreams.de>,
	Simon Horman <horms+renesas@verge.net.au>,
	Magnus Damm <damm@opensource.se>,
	linux-i2c@vger.kernel.org, linux-sh@vger.kernel.org
Subject: [PATCH 6/6] i2c: rcar: fix NACK error code
Date: Sun, 26 Jan 2014 16:05:37 +0000	[thread overview]
Message-ID: <1390752337-22386-7-git-send-email-ben.dooks@codethink.co.uk> (raw)
In-Reply-To: <1390752337-22386-1-git-send-email-ben.dooks@codethink.co.uk>

The response to a bus NACK is to return -ENXIO instead of the
-EREMOTEIO being currently returned by the driver.

Signed-off-by: Ben Dooks <ben.dooks@codethink.co.uk>
---
Cc: Wolfram Sang <wsa@the-dreams.de>
Cc: Simon Horman <horms+renesas@verge.net.au>
Cc: Magnus Damm <damm@opensource.se>
Cc: linux-i2c@vger.kernel.org
Cc: linux-sh@vger.kernel.org
---
 drivers/i2c/busses/i2c-rcar.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/i2c/busses/i2c-rcar.c b/drivers/i2c/busses/i2c-rcar.c
index dc8c224..fa16adf 100644
--- a/drivers/i2c/busses/i2c-rcar.c
+++ b/drivers/i2c/busses/i2c-rcar.c
@@ -599,7 +599,7 @@ static int rcar_i2c_master_xfer(struct i2c_adapter *adap,
 		 * error handling
 		 */
 		if (rcar_i2c_flags_has(priv, ID_NACK)) {
-			ret = -EREMOTEIO;
+			ret = -ENXIO;
 			break;
 		}
 
@@ -618,7 +618,7 @@ static int rcar_i2c_master_xfer(struct i2c_adapter *adap,
 
 	pm_runtime_put(dev);
 
-	if (ret < 0 && ret != -EREMOTEIO)
+	if (ret < 0 && ret != -ENXIO)
 		dev_err(dev, "error %d : %x\n", ret, priv->flags);
 
 	return ret;
-- 
1.8.5.2


      parent reply	other threads:[~2014-01-26 16:05 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <1390752337-22386-1-git-send-email-ben.dooks@codethink.co.uk>
2014-01-26 16:05 ` [PATCH 4/6] i2c: rcar: use devm_clk_get to ensure clock is properly ref-counted Ben Dooks
     [not found] ` <1390752337-22386-1-git-send-email-ben.dooks-4yDnlxn2s6sWdaTGBSpHTA@public.gmane.org>
2014-01-26 16:05   ` [PATCH 3/6] i2c: rcar: do not print error if device nacks transfer Ben Dooks
     [not found]     ` <1390752337-22386-4-git-send-email-ben.dooks-4yDnlxn2s6sWdaTGBSpHTA@public.gmane.org>
2014-01-26 21:50       ` Wolfram Sang
2014-02-16  9:46     ` Wolfram Sang
2014-02-16 10:25       ` Geert Uytterhoeven
2014-02-16 11:46         ` Wolfram Sang
2014-02-17  8:04       ` Ben Dooks
2014-05-08 22:03     ` Sergei Shtylyov
     [not found]       ` <536BFF39.40607-M4DtvfQ/ZS1MRgGoP+s0PdBPR1lH4CV8@public.gmane.org>
2014-05-09  5:04         ` Wolfram Sang
2014-05-09  9:32       ` Ben Dooks
     [not found]         ` <536CA0B1.4040300-4yDnlxn2s6sWdaTGBSpHTA@public.gmane.org>
2014-05-09 22:55           ` Sergei Shtylyov
2014-01-26 16:05   ` [PATCH 5/6] i2c: update i2c_algorithm documentation Ben Dooks
2014-01-26 16:05 ` Ben Dooks [this message]

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=1390752337-22386-7-git-send-email-ben.dooks@codethink.co.uk \
    --to=ben.dooks@codethink.co.uk \
    --cc=damm@opensource.se \
    --cc=horms+renesas@verge.net.au \
    --cc=linux-i2c@vger.kernel.org \
    --cc=linux-kernel@lists.codethink.co.uk \
    --cc=linux-sh@vger.kernel.org \
    --cc=wsa@the-dreams.de \
    /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).