From patchwork Fri Sep 2 21:22:15 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 9311681 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id EF2DD60772 for ; Fri, 2 Sep 2016 21:22:58 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DFCA92983D for ; Fri, 2 Sep 2016 21:22:58 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D49FE29848; Fri, 2 Sep 2016 21:22:58 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 825EB2983D for ; Fri, 2 Sep 2016 21:22:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751494AbcIBVW5 (ORCPT ); Fri, 2 Sep 2016 17:22:57 -0400 Received: from mail-wm0-f67.google.com ([74.125.82.67]:36504 "EHLO mail-wm0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751190AbcIBVW5 (ORCPT ); Fri, 2 Sep 2016 17:22:57 -0400 Received: by mail-wm0-f67.google.com with SMTP id i138so4375980wmf.3 for ; Fri, 02 Sep 2016 14:22:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:subject:to:references:cc:message-id:date:user-agent :mime-version:in-reply-to:content-transfer-encoding; bh=j4XV54XPAJlvdHZG0/fUpzEdROE9B4J4V/x3p9AxU6s=; b=Erl/AZvd7EdT3MvOLhMXj6EAkIv67pBoCA4DtPcyf+0NVovDYykZIniTtx/BvS2cb4 f7NkymeUzAI5/SFP1cxXDyk1ZNfeBPN7LkK5GYNzk/LZvKiaiEWmFytkpl279Ki0Vf2n vf9R1BN/muEKlsnp2A7BPXp8c0sNV6ehoKAVBhP4xvGNWwOXa9pqAVIrVCHOTI/ynUTR O+4/QwnLKxKlMOYv5s5PJNPWWtyH/4nqegn69LAglTjJlDT112MuzbM8ARZk/kYamhpE dfN/ZstV2irqcrK5IIFk0ZNE+LRC/TfejpCfH71V/1a0NFLpwc+E9C8138f9kSxtDJgH T7Iw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:subject:to:references:cc:message-id:date :user-agent:mime-version:in-reply-to:content-transfer-encoding; bh=j4XV54XPAJlvdHZG0/fUpzEdROE9B4J4V/x3p9AxU6s=; b=a7HVxRa5p3pY1xSrD+V52GWRPXABERRSiZ0lh3lPYX7A3+8TykRFkMT/9mQeDC4BGz MErV/rCo28oezRPB+qar1kVTOC4vx5v+ILDcLbYbXVmO0LSLevSNNMNOyAu1autx6lPO YaYfZ0P64+SiV1RgjtSkrTprzbwGDwQDwAndv8Og2ht3t/cIEtOb1IlGFidiHlApTTY7 rrIJSpYu8smOtQOUwDiD3PCSnIW3dQbd+F2+erlOsJJsVkw1guEc+E4MZCdD2nIhxGbo 45jgYbPxv7l01LdR/0fcH3Lh6EJ0NSdJOc9vvDfmkjFdprLru4+SC60HaCTR1zk8oFP3 422A== X-Gm-Message-State: AE9vXwMpYRcZ0ZenbXD/khn5/yPpY1/d4BQXnmyBEA6/mn2m0CgOEjQSX4BmYKq6qjHECA== X-Received: by 10.28.139.75 with SMTP id n72mr4947964wmd.104.1472851375703; Fri, 02 Sep 2016 14:22:55 -0700 (PDT) Received: from ?IPv6:2003:62:5f43:9500:39ed:a1fb:9a43:e02d? (p200300625F43950039EDA1FB9A43E02D.dip0.t-ipconnect.de. [2003:62:5f43:9500:39ed:a1fb:9a43:e02d]) by smtp.googlemail.com with ESMTPSA id yz6sm12242391wjb.35.2016.09.02.14.22.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 02 Sep 2016 14:22:55 -0700 (PDT) From: Heiner Kallweit Subject: [PATCH v2 12/23] spi: fsl-espi: fix status handling in fsl_espi_do_one_msg To: Mark Brown References: Cc: "linux-spi@vger.kernel.org" Message-ID: <7aede0d3-1ec5-81c4-5079-7685b3b2d3bf@gmail.com> Date: Fri, 2 Sep 2016 23:22:15 +0200 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:45.0) Gecko/20100101 Thunderbird/45.2.0 MIME-Version: 1.0 In-Reply-To: Sender: linux-spi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-spi@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP If an error occurred during message handling return this error instead of always returning 0 and align the code with the generic implementation in spi_transfer_one_message. Signed-off-by: Heiner Kallweit --- v2: - rebased --- drivers/spi/spi-fsl-espi.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/spi/spi-fsl-espi.c b/drivers/spi/spi-fsl-espi.c index 5f01b65..6b60f7b 100644 --- a/drivers/spi/spi-fsl-espi.c +++ b/drivers/spi/spi-fsl-espi.c @@ -381,9 +381,12 @@ static int fsl_espi_do_one_msg(struct spi_master *master, ret = fsl_espi_rw_trans(m, &espi_trans, rx_buf); m->actual_length = espi_trans.actual_length; - m->status = ret; + if (m->status == -EINPROGRESS) + m->status = ret; + spi_finalize_current_message(master); - return 0; + + return ret; } static int fsl_espi_setup(struct spi_device *spi)