From patchwork Mon Oct 12 13:26:55 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 270381 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=-9.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, 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 55C5DC433DF for ; Mon, 12 Oct 2020 13:35:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0E81F2222A for ; Mon, 12 Oct 2020 13:35:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1602509730; bh=9vOzk6L5ZlgzV3aSRh7G4WCOGUmax/tn8RhXBuTL/64=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=2V/jB02Aq0US3PDGF4pPlFbvTPt5FYJHfPRY31R2EqR4NBpgvAc8Dl3ls5RUpojej yp60vaNZ1Ef0DFZyB9jTRIWZe2x1ZJHwHhq/kPjfKAy3Qb5qUPMKMROAFGqg0C6ZEm qmrBKPRm7ak80t6fXn/0xGK6pE6/uD/7GXIOutu8= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728446AbgJLNf2 (ORCPT ); Mon, 12 Oct 2020 09:35:28 -0400 Received: from mail.kernel.org ([198.145.29.99]:36910 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730640AbgJLNe2 (ORCPT ); Mon, 12 Oct 2020 09:34:28 -0400 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (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 5D2C920838; Mon, 12 Oct 2020 13:34:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1602509665; bh=9vOzk6L5ZlgzV3aSRh7G4WCOGUmax/tn8RhXBuTL/64=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Nk0/5PWJx0aJ1fpj/a5Mq7wOhNpPtbopufJj25uI0CaPMmRzsARKDrEXTMrPDEVlD IOcGrx/xNX0NXg2xVGxJ1FfF6TqSOvPgbhlsm7a00D/OOZ0vZZJ5GlmAhBVlSYbaO6 l822LGYczCzZ8JXQzZuZDvs426g5fAH8MqzKtp8o= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Miquel Raynal , Nobuhiro Iwamatsu Subject: [PATCH 4.9 33/54] mtd: rawnand: sunxi: Fix the probe error path Date: Mon, 12 Oct 2020 15:26:55 +0200 Message-Id: <20201012132631.124815696@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201012132629.585664421@linuxfoundation.org> References: <20201012132629.585664421@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Miquel Raynal commit 3d84515ffd8fb657e10fa5b1215e9f095fa7efca upstream. nand_release() is supposed be called after MTD device registration. Here, only nand_scan() happened, so use nand_cleanup() instead. Fixes: 1fef62c1423b ("mtd: nand: add sunxi NAND flash controller support") Signed-off-by: Miquel Raynal Cc: stable@vger.kernel.org Link: https://lore.kernel.org/linux-mtd/20200519130035.1883-54-miquel.raynal@bootlin.com [iwamatsu: adjust filename] Signed-off-by: Nobuhiro Iwamatsu Signed-off-by: Greg Kroah-Hartman --- drivers/mtd/nand/sunxi_nand.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/mtd/nand/sunxi_nand.c +++ b/drivers/mtd/nand/sunxi_nand.c @@ -2108,7 +2108,7 @@ static int sunxi_nand_chip_init(struct d ret = mtd_device_register(mtd, NULL, 0); if (ret) { dev_err(dev, "failed to register mtd device: %d\n", ret); - nand_release(nand); + nand_cleanup(nand); return ret; }