From patchwork Wed Jul 3 08:59:22 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandre Belloni X-Patchwork-Id: 256565 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 0753B2C0092 for ; Wed, 3 Jul 2013 18:59:45 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932283Ab3GCI7n (ORCPT ); Wed, 3 Jul 2013 04:59:43 -0400 Received: from mail.free-electrons.com ([94.23.35.102]:49885 "EHLO mail.free-electrons.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932066Ab3GCI7n (ORCPT ); Wed, 3 Jul 2013 04:59:43 -0400 Received: by mail.free-electrons.com (Postfix, from userid 106) id 600D6822; Wed, 3 Jul 2013 10:59:42 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on mail.free-electrons.com X-Spam-Level: X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,SHORTCIRCUIT, URIBL_BLOCKED shortcircuit=ham autolearn=disabled version=3.3.2 Received: from localhost (128-79-216-144.hfc.dyn.abo.bbox.fr [128.79.216.144]) by mail.free-electrons.com (Postfix) with ESMTPSA id EEC30755; Wed, 3 Jul 2013 10:59:31 +0200 (CEST) From: Alexandre Belloni To: Wolfram Sang Cc: linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org, marex@denx.de, Alexandre Belloni Subject: [PATCH] i2c: mxs: Better error handling Date: Wed, 3 Jul 2013 10:59:22 +0200 Message-Id: <1372841962-26310-1-git-send-email-alexandre.belloni@free-electrons.com> X-Mailer: git-send-email 1.8.1.2 Sender: linux-i2c-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-i2c@vger.kernel.org This patch fixes two error handling cases in mxs_i2c_xfer_msg(): - in PIO mode, mxs_i2c_pio_setup_xfer() may return an error but i2c->cmd_err will not be set so mxs_i2c_xfer_msg() fails silently. - in DMA mode, mxs_i2c_dma_setup_xfer() may return an error and have i2c->cmd_err set to -ENXIO. In that case, we want to go through the MXS_I2C_CTRL1_CLR_GOT_A_NAK before returning. Signed-off-by: Alexandre Belloni --- drivers/i2c/busses/i2c-mxs.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/i2c/busses/i2c-mxs.c b/drivers/i2c/busses/i2c-mxs.c index 2039f23..92f22b0 100644 --- a/drivers/i2c/busses/i2c-mxs.c +++ b/drivers/i2c/busses/i2c-mxs.c @@ -502,7 +502,7 @@ static int mxs_i2c_xfer_msg(struct i2c_adapter *adap, struct i2c_msg *msg, INIT_COMPLETION(i2c->cmd_complete); ret = mxs_i2c_dma_setup_xfer(adap, msg, flags); if (ret) - return ret; + goto exit; ret = wait_for_completion_timeout(&i2c->cmd_complete, msecs_to_jiffies(1000)); @@ -510,6 +510,7 @@ static int mxs_i2c_xfer_msg(struct i2c_adapter *adap, struct i2c_msg *msg, goto timeout; } +exit: if (i2c->cmd_err == -ENXIO) { /* * If the transfer fails with a NAK from the slave the @@ -519,7 +520,8 @@ static int mxs_i2c_xfer_msg(struct i2c_adapter *adap, struct i2c_msg *msg, i2c->regs + MXS_I2C_CTRL1_SET); } - ret = i2c->cmd_err; + if (i2c->cmd_err) + ret = i2c->cmd_err; dev_dbg(i2c->dev, "Done with err=%d\n", ret);