From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ben Dooks Subject: [PATCH 6/6] i2c: rcar: fix NACK error code Date: Sun, 26 Jan 2014 16:05:37 +0000 Message-ID: <1390752337-22386-7-git-send-email-ben.dooks@codethink.co.uk> References: <1390752337-22386-1-git-send-email-ben.dooks@codethink.co.uk> Return-path: In-Reply-To: <1390752337-22386-1-git-send-email-ben.dooks@codethink.co.uk> Sender: linux-sh-owner@vger.kernel.org To: linux-kernel@lists.codethink.co.uk Cc: Ben Dooks , Wolfram Sang , Simon Horman , Magnus Damm , linux-i2c@vger.kernel.org, linux-sh@vger.kernel.org List-Id: linux-i2c@vger.kernel.org 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 --- Cc: Wolfram Sang Cc: Simon Horman Cc: Magnus Damm 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