From patchwork Fri Mar 2 17:03:44 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Miquel Raynal X-Patchwork-Id: 10255295 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 F33416037F for ; Fri, 2 Mar 2018 17:40:24 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DF09827816 for ; Fri, 2 Mar 2018 17:40:24 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D048827853; Fri, 2 Mar 2018 17:40:24 +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=-1.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 556FA27816 for ; Fri, 2 Mar 2018 17:40:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To: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:List-Owner; bh=o9Ww3qe+ZihyGW7Gx3apijqCz9gImoF6e9yggHWNjSQ=; b=i/l1OdpnDZ38DXgTlavfJ5LKRg lIfWxLyYE1f08I/Dv1J2/mrjy9463etD+RRo06efSznrkaNgJW2Cw3ntRR7g6BgmDe87Z8gCivJau Jy5peXCxRdE6TdDdqu4B3ybv2DV5NNEd73bVOFSmkbnmQlbcBdfYUeKqdK3LqNyDTzKEhQFKvGpwz 9H4WNSIIuf+w6C67vl43vIWHAoFurGxAOadTE6GlAu35kUmU7j+hOia07WwOi7EiuPuJaxPt43b4b Q9jl+kozWXBcsQvwPzDf+Sy5/dwwCF1glAzHbd5DWItb0YF0TEH40ZFoAOJDLKO0R7cyzCrwsUMnu ZB2QobAg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.89 #1 (Red Hat Linux)) id 1erofI-0000g0-W9; Fri, 02 Mar 2018 17:40:17 +0000 Received: from casper.infradead.org ([2001:8b0:10b:1236::1]) by bombadil.infradead.org with esmtps (Exim 4.89 #1 (Red Hat Linux)) id 1eroAB-0005sL-Vn; Fri, 02 Mar 2018 17:08:07 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=References:In-Reply-To:Message-Id:Date: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=ePhnWxtSzUsvAP8nmX9xgGkyZXu3l4jGAXRi9mxELwE=; b=RF5z8N0b/oSac+Db0KHe4JOKY RxEmqATEb8D29NmuF/J32k6XZMZ3cLaYFPxpQwchIsAnNULhPT97dI+Tneu/lSgIgNYsZTUTp2P7k A4SSViCtgNRiEigHYr6P64Fohca2s9peufaw+neeLOnwewbQWQyisAG7I4Y01oWni9StYyGYe2Q07 XYCXXtulamgKKEZ5wHkZiWn9HH4AK0NpSoHapAkQzzdB1Tx9ulR2WBxqFg9xgAT4lP/V9uedRuJkd 0f2Y38w8e09WeW3IpcZtJwx0zI2drUuExb1k+QmB4t0XWf6nSYfPlx303uxiPss+fF8R7uuXcIXTn rT7lgF1qg==; Received: from mail.bootlin.com ([62.4.15.54]) by casper.infradead.org with esmtp (Exim 4.89 #1 (Red Hat Linux)) id 1ero7A-0005rl-Ej; Fri, 02 Mar 2018 17:05:01 +0000 Received: by mail.bootlin.com (Postfix, from userid 110) id 3544E209EB; Fri, 2 Mar 2018 18:04:36 +0100 (CET) Received: from localhost.localdomain (unknown [91.224.148.103]) by mail.bootlin.com (Postfix) with ESMTPSA id 57F70207EF; Fri, 2 Mar 2018 18:04:35 +0100 (CET) From: Miquel Raynal To: Boris Brezillon , Richard Weinberger , David Woodhouse , Brian Norris , Marek Vasut , Cyrille Pitchen , Josh Wu , Kamal Dasu , Harvey Hunt , Stefan Agner Subject: [PATCH 36/52] mtd: rawnand: sh_flctl: fix the probe function error path Date: Fri, 2 Mar 2018 18:03:44 +0100 Message-Id: <20180302170400.6712-37-miquel.raynal@bootlin.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20180302170400.6712-1-miquel.raynal@bootlin.com> References: <20180302170400.6712-1-miquel.raynal@bootlin.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180302_170500_561981_D1EFF840 X-CRM114-Status: GOOD ( 13.84 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-mtd@lists.infradead.org, linux-arm-kernel@lists.infradead.org, Miquel Raynal MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP An error after nand_scan_tail() call should trigger a nand_release() call. This is rightly handled in the remove function, but not in the probe function. Signed-off-by: Miquel Raynal --- drivers/mtd/nand/raw/sh_flctl.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/mtd/nand/raw/sh_flctl.c b/drivers/mtd/nand/raw/sh_flctl.c index d14c26cb59df..67f125d56771 100644 --- a/drivers/mtd/nand/raw/sh_flctl.c +++ b/drivers/mtd/nand/raw/sh_flctl.c @@ -1214,9 +1214,13 @@ static int flctl_probe(struct platform_device *pdev) ret = mtd_device_register(flctl_mtd, flctl->pdata->parts, flctl->pdata->nr_parts); + if (ret) + goto release_nand; return 0; +release_nand: + nand_release(flctl_mtd); err_chip: flctl_release_dma(flctl); pm_runtime_disable(&pdev->dev);