From patchwork Wed Jan 20 05:00:25 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pan Bian X-Patchwork-Id: 12031451 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 97A84C433E9 for ; Wed, 20 Jan 2021 05:03:42 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 1F30C221E3 for ; Wed, 20 Jan 2021 05:03:42 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1F30C221E3 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=163.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:MIME-Version:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Owner; bh=vnJ5tm3x6KJQFZTve30/aRR1EoJovOwgYBat/LFeFk0=; b=UwOn3CiGCjcME9w0O2f4P98Dje GW7328udQraUeCcZMzoHnDK3eRURw3rpMgqIFLSdTCgyt7cwdlrqXAwB/O5Z+Fik8VjsX0bsqBOn/ /Prxb//vbimjcK2BLamn6nfk3AvCJxQc74Vl0IfHbTMiFrWpgkEHjJ16MAQmWYDa2zOvdYws9ZXKW 37+C2lXTqq3G8T5LQMsz7hycF04lo5ZfCt3g9k5YJkdSXIVNGghILrEGD1Gjir3k0XatIazrTfFOD ezNEh2J2h0ED7PRaNrpqkxBfqspgBSrAbBxta5mkk/WQWjKDXh/FAJq06Kxf0xgqFG4ScyAlRir0B Z00YAw2g==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1l25cs-0002U9-JL; Wed, 20 Jan 2021 05:01:50 +0000 Received: from m12-17.163.com ([220.181.12.17]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1l25cp-0002TA-5o for linux-arm-kernel@lists.infradead.org; Wed, 20 Jan 2021 05:01:48 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id; bh=kumweQCm49IOHGVUgE 8mZ0J08U4AoSpcAfVyFN+271M=; b=DTLQ1lA7Dmc7OBQf6rxXK+/5+0F29rgnBt r8TbdEI/tGF/WgUL9MmZ9yo/DbD2+8D+ZeqMurTX0SZRFBVxmf9nBDCUVISKIoCq 1u7BS1LSqM+O3ZQwcpezprrzoGqORJnobNWv5YTt4EIleOY4q+tPUSo8d026g0IP xd7FPloA0= Received: from localhost.localdomain (unknown [119.3.119.20]) by smtp13 (Coremail) with SMTP id EcCowAAXCLTquAdgiLzLgg--.2351S4; Wed, 20 Jan 2021 13:00:30 +0800 (CST) From: Pan Bian To: Tudor Ambarus , Mark Brown , Nicolas Ferre , Alexandre Belloni , Ludovic Desroches , Cyrille Pitchen Subject: [PATCH 1/1] spi: atmel: Put allocated master before return Date: Tue, 19 Jan 2021 21:00:25 -0800 Message-Id: <20210120050025.25426-1-bianpan2016@163.com> X-Mailer: git-send-email 2.17.1 X-CM-TRANSID: EcCowAAXCLTquAdgiLzLgg--.2351S4 X-Coremail-Antispam: 1Uf129KBjvdXoWrZw48KFWkGry8Xr1rtr13urg_yoW3Xrb_Cr y09r1xGr4YkrsrAw15Zr4fZrySvF15Xwnakr1qqFZxJ3yDJr12y3yDZF4DXFWUZw47Zr9F kr1DXryFvry5AjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUvcSsGvfC2KfnxnUUI43ZEXa7IUjVc_DUUUUU== X-Originating-IP: [119.3.119.20] X-CM-SenderInfo: held01tdqsiiqw6rljoofrz/xtbBZw0gclet1gYF1gABsA X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210120_000147_743004_2917F9CD X-CRM114-Status: GOOD ( 12.15 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Pan Bian , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-spi@vger.kernel.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org The allocated master is not released. Goto error handling label rather than directly return. Fixes: 04242ca4e891 ("spi: atmel: Use SPI core DMA mapping framework") Signed-off-by: Pan Bian Reviewed-by: Tudor Ambarus --- drivers/spi/spi-atmel.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/spi/spi-atmel.c b/drivers/spi/spi-atmel.c index 948396b382d7..f429436082af 100644 --- a/drivers/spi/spi-atmel.c +++ b/drivers/spi/spi-atmel.c @@ -1590,7 +1590,7 @@ static int atmel_spi_probe(struct platform_device *pdev) if (ret == 0) { as->use_dma = true; } else if (ret == -EPROBE_DEFER) { - return ret; + goto out_unmap_regs; } } else if (as->caps.has_pdc_support) { as->use_pdc = true;