From patchwork Fri Jun 19 14:34:21 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 224086 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=-6.8 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, 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 9CB64C433E2 for ; Fri, 19 Jun 2020 15:19:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 791322158C for ; Fri, 19 Jun 2020 15:19:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592579989; bh=59NqwUWWhjfYF1vPj0tVIAxyPg99f5wPdqso9o8QcF4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=MjUF3zjjJTIuF2muwXcyMmAIMhKm6lWLikGG6+jEnlzEIfgV/LrJfSRbgFV95dkFK XYcMAvnhGfS7M04Mf4YYc/bK7tgEtv8I9sljYLrMtvKSE+xTtR+osex1iZ3T5Aa/b/ IWPD6yj5jE8MgHnfeTKTHSKnH9h8wGgmwdBFZgic= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2404231AbgFSPTs (ORCPT ); Fri, 19 Jun 2020 11:19:48 -0400 Received: from mail.kernel.org ([198.145.29.99]:46364 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2392431AbgFSPPt (ORCPT ); Fri, 19 Jun 2020 11:15:49 -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 208D121582; Fri, 19 Jun 2020 15:15:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592579748; bh=59NqwUWWhjfYF1vPj0tVIAxyPg99f5wPdqso9o8QcF4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=g1jhIjomShVPaxuYBsReBQcupToAqtr+m+wbuw355HGKP8glxWoN7NA/5EbaqClv7 /I3ME4M2mnSLGtkrQWeCtO5LxFGf6+OOn1sTg2Bi09TxoYHuXvO4Hkwoyy0rm6vz6u Lbdj25OjhfIoQJHTcwegB80WrvUCKdlK6/+D5JM4= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Miquel Raynal Subject: [PATCH 5.4 250/261] mtd: rawnand: sunxi: Fix the probe error path Date: Fri, 19 Jun 2020 16:34:21 +0200 Message-Id: <20200619141701.866294761@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200619141649.878808811@linuxfoundation.org> References: <20200619141649.878808811@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 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 Signed-off-by: Greg Kroah-Hartman --- drivers/mtd/nand/raw/sunxi_nand.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/mtd/nand/raw/sunxi_nand.c +++ b/drivers/mtd/nand/raw/sunxi_nand.c @@ -2003,7 +2003,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; }