From patchwork Sun Jan 26 16:05:37 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Dooks X-Patchwork-Id: 314194 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 8CF7D2C0098 for ; Mon, 27 Jan 2014 03:05:47 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752866AbaAZQFq (ORCPT ); Sun, 26 Jan 2014 11:05:46 -0500 Received: from 82-68-191-81.dsl.posilan.com ([82.68.191.81]:41172 "EHLO rainbowdash.ducie.codethink.co.uk" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752852AbaAZQFp (ORCPT ); Sun, 26 Jan 2014 11:05:45 -0500 Received: from ben by rainbowdash.ducie.codethink.co.uk with local (Exim 4.82) (envelope-from ) id 1W7SDN-0005q9-R8; Sun, 26 Jan 2014 16:05:41 +0000 From: Ben Dooks 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 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> X-Mailer: git-send-email 1.8.5.2 In-Reply-To: <1390752337-22386-1-git-send-email-ben.dooks@codethink.co.uk> References: <1390752337-22386-1-git-send-email-ben.dooks@codethink.co.uk> Sender: linux-i2c-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: 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;