From patchwork Fri Mar 2 17:03:36 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Miquel Raynal X-Patchwork-Id: 10255395 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 C735C6037D for ; Fri, 2 Mar 2018 18:39:26 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B856528210 for ; Fri, 2 Mar 2018 18:39:26 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id ACA9E2811A; Fri, 2 Mar 2018 18:39:26 +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 1898C2811A for ; Fri, 2 Mar 2018 18:39:25 +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=C1c72Z22xdb3Ob9TzCog2HVqlp+lpbegrmBa5H5B+Dk=; b=INFRkfaNItGUavwbW+Ub0DpShm yDyKjK4EM/KHCkyqt0GX/ckLL0Yj0HIV/4VMfb7YAXF89XWSKLB8pEeYvo0B6nUZeCjtDiIn7R3xW HrmmuhI8lt0ARWjqhdBMgv6BzDR/ly0WJEllQmXOiE6Ks3UU/JECvJGpswCk7QFw7qx80fxEMpyJb iUv/5MbjCqO4TtmscEZzVLKnZE2DNEBb4IKq5skuU/MqLjMPjzepMBpWfIGi8fhUc+hZNRnc9AiSe lMg4ZjR1LII6NW7WSMraQ/dyKpYVVzljCYf5GqZM8RSa4SeoKrk2Wd9Ox2VPWow18pVE9mkADWdvp +IEk3SXw==; 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 1erpaU-0006Di-Ah; Fri, 02 Mar 2018 18:39:22 +0000 Received: from merlin.infradead.org ([2001:8b0:10b:1231::1]) by bombadil.infradead.org with esmtps (Exim 4.89 #1 (Red Hat Linux)) id 1erpC9-0001qC-Ce; Fri, 02 Mar 2018 18:14:13 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=merlin.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=JvusweS2/lDR9ljHOJJPduAcPQ5LK3H3JqQCaoe/nHQ=; b=TUUHlruNYq/UScBu/RRo5RY2Q lXfK1GdSl6QLqw6aywIOtmLlNiRAM+r2Ueo29nvicZjV5WBnNrlCScl6XBf4adzvoCDPRhmb3wvSr U5lJ06/UqKzzlpBtKgKYJhKaOzL1430g8R+eM7POBykKf0ui8Qy9GaynVcK1q+KELKYi3W6MMX+U6 B3MzqJAe6AKdb3qagYHTDu5+becSt7FhnwSTqmA9jvwQQb4X3CqXsgL1tsPvKoArq7E5mQFC9qDN4 y7YBZhHF0P0V1DbJDBQo229aW9vLC+buZYDVCyixDD4ZoR0jWqIr/NgOWstq6FGSzSGLlz2wXT4Yb CamGSLFxg==; Received: from mail.bootlin.com ([62.4.15.54]) by merlin.infradead.org with esmtp (Exim 4.89 #1 (Red Hat Linux)) id 1ero79-00075a-HU; Fri, 02 Mar 2018 17:05:00 +0000 Received: by mail.bootlin.com (Postfix, from userid 110) id 52A29209D4; Fri, 2 Mar 2018 18:04:30 +0100 (CET) Received: from localhost.localdomain (unknown [91.224.148.103]) by mail.bootlin.com (Postfix) with ESMTPSA id 79878207EF; Fri, 2 Mar 2018 18:04:29 +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 28/52] mtd: rawnand: mxc: fix probe function error path Date: Fri, 2 Mar 2018 18:03:36 +0100 Message-Id: <20180302170400.6712-29-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_120459_711563_3008B5F4 X-CRM114-Status: GOOD ( 11.13 ) 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() should trigger a nand_release(). The helper mtd_device_parse_register() returns an error code that should be checked and nand_release() called accordingly. Signed-off-by: Miquel Raynal --- drivers/mtd/nand/raw/mxc_nand.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/drivers/mtd/nand/raw/mxc_nand.c b/drivers/mtd/nand/raw/mxc_nand.c index 944ecf03d3b1..948fe3e9d8da 100644 --- a/drivers/mtd/nand/raw/mxc_nand.c +++ b/drivers/mtd/nand/raw/mxc_nand.c @@ -1911,15 +1911,18 @@ static int mxcnd_probe(struct platform_device *pdev) goto escan; /* Register the partitions */ - mtd_device_parse_register(mtd, part_probes, - NULL, - host->pdata.parts, - host->pdata.nr_parts); + err = mtd_device_parse_register(mtd, part_probes, NULL, + host->pdata.parts, + host->pdata.nr_parts); + if (err) + goto release_nand; platform_set_drvdata(pdev, host); return 0; +release_nand: + nand_release(mtd); escan: if (host->clk_act) clk_disable_unprepare(host->clk);