From patchwork Tue Jun 23 19:58:41 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 223400 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=-10.0 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY,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 3A1D0C433DF for ; Tue, 23 Jun 2020 20:43:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 100C72053B for ; Tue, 23 Jun 2020 20:43:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592944986; bh=d5QR1Ag6rBNWvjANUHL93Zcd1mSrh47z1OiTT0JNeew=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=QRg8kvxEK6mkeKPzHRBVE/Q5txA2GdSO1ly5zfeN9FlBelza/VwRfmlR4fWEeta6a 6nsikfSp9mqXy3NRnUBUM4yZZ48a6+jrpHYUTCcyKMXjfLOGGKrbfmlcphGajVmr+L 4jTXLnsHXsabLHLaqWa/5TI66g/PC1ywMhardNFM= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2392465AbgFWUnE (ORCPT ); Tue, 23 Jun 2020 16:43:04 -0400 Received: from mail.kernel.org ([198.145.29.99]:39754 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2403824AbgFWUnC (ORCPT ); Tue, 23 Jun 2020 16:43:02 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id B5B432070E; Tue, 23 Jun 2020 20:43:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592944982; bh=d5QR1Ag6rBNWvjANUHL93Zcd1mSrh47z1OiTT0JNeew=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XKhcEOdfbd4YhAWZuyztFF9tXwkCA4iMReAxU2PX60DY8rUhdKkm7821OUUvKOT0K 0M+mdkXszZIKKUZ5u2lZDPreWl+GAp/P2vvctapK2kAYUtVn4LmI4TCyT7tEByiGLF nDGDJIC2Uj8kHeWtM/w0233pWfpt2XpDpvWtXwBQ= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Miquel Raynal , Sasha Levin Subject: [PATCH 4.19 193/206] mtd: rawnand: mtk: Fix the probe error path Date: Tue, 23 Jun 2020 21:58:41 +0200 Message-Id: <20200623195326.519103927@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200623195316.864547658@linuxfoundation.org> References: <20200623195316.864547658@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Miquel Raynal [ Upstream commit 8a82bbcadec877f5f938c54026278dfc1f05a332 ] nand_release() is supposed be called after MTD device registration. Here, only nand_scan() happened, so use nand_cleanup() instead. There is no real Fixes tag applying here as the use of nand_release() in this driver predates the introduction of nand_cleanup() in commit d44154f969a4 ("mtd: nand: Provide nand_cleanup() function to free NAND related resources") which makes this change possible. However, pointing this commit as the culprit for backporting purposes makes sense even if this commit is not introducing any bug. Fixes: d44154f969a4 ("mtd: nand: Provide nand_cleanup() function to free NAND related resources") Signed-off-by: Miquel Raynal Cc: stable@vger.kernel.org Link: https://lore.kernel.org/linux-mtd/20200519130035.1883-28-miquel.raynal@bootlin.com Signed-off-by: Sasha Levin --- drivers/mtd/nand/raw/mtk_nand.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/mtd/nand/raw/mtk_nand.c b/drivers/mtd/nand/raw/mtk_nand.c index 9c2ae8e873478..bb40022e109f2 100644 --- a/drivers/mtd/nand/raw/mtk_nand.c +++ b/drivers/mtd/nand/raw/mtk_nand.c @@ -1389,7 +1389,7 @@ static int mtk_nfc_nand_chip_init(struct device *dev, struct mtk_nfc *nfc, ret = mtd_device_register(mtd, NULL, 0); if (ret) { dev_err(dev, "mtd parse partition error\n"); - nand_release(nand); + nand_cleanup(nand); return ret; }