diff mbox series

[4.9,33/54] mtd: rawnand: sunxi: Fix the probe error path

Message ID	20201012132631.124815696@linuxfoundation.org
State	New
Headers	show Return-Path: <SRS0=uWP8=DT=vger.kernel.org=stable-owner@kernel.org> From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, stable@vger.kernel.org, Miquel Raynal <miquel.raynal@bootlin.com>, Nobuhiro Iwamatsu <nobuhiro1.iwamatsu@toshiba.co.jp> 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> In-Reply-To: <20201012132629.585664421@linuxfoundation.org> References: <20201012132629.585664421@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	None \| expand [4.9,02/54] vsock/virtio: stop workers during the .remove() [4.9,03/54] USB: gadget: f_ncm: Fix NDP16 datagram validation [4.9,07/54] net: dec: de2104x: Increase receive ring size for Tulip [4.9,08/54] rndis_host: increase sleep time in the query-response loop [4.9,11/54] mac80211: do not allow bigger VHT MPDUs than the hardware supports [4.9,13/54] clk: samsung: exynos4: mark chipid clock as CLK_IGNORE_UNUSED [4.9,15/54] i2c: cpm: Fix i2c_ram structure [4.9,16/54] random32: Restore __latent_entropy attribute on net_rand_state [4.9,17/54] net/packet: fix overflow in tpacket_rcv [4.9,19/54] epoll: replace ->visited/visited_list with generation count [4.9,21/54] ep_create_wakeup_source(): dentry name can change under you... [4.9,24/54] Fonts: Support FONT_EXTRA_WORDS macros for built-in fonts [4.9,25/54] Revert "ravb: Fixed to be able to unload modules" [4.9,26/54] fbcon: Fix global-out-of-bounds read in fbcon_get_font() [4.9,29/54] platform/x86: thinkpad_acpi: initialize tp_nvram_state variable [4.9,33/54] mtd: rawnand: sunxi: Fix the probe error path [4.9,35/54] macsec: avoid use-after-free in macsec_handle_frame() [4.9,38/54] team: set dev->needed_headroom in team_setup_by_port() [4.9,39/54] net: team: fix memory leak in __team_options_register [4.9,40/54] openvswitch: handle DNAT tuple collision [4.9,42/54] xfrm: clone XFRMA_REPLAY_ESN_VAL in xfrm_do_migrate [4.9,46/54] bonding: set dev->needed_headroom in bond_setup_by_slave() [4.9,47/54] mdio: fix mdio-thunder.c dependency & build error [4.9,50/54] rxrpc: Fix some missing _bh annotations on locking conn->state_lock [4.9,52/54] perf: Fix task_function_call() error handling [4.9,53/54] mm: khugepaged: recalculate min_free_kbytes after memory hotplug as expected by khuge... [4.9,54/54] net: usb: rtl8150: set random MAC address when set_ethernet_addr() fails

Commit Message

Greg Kroah-Hartman Oct. 12, 2020, 1:26 p.m. UTC

From: Miquel Raynal <miquel.raynal@bootlin.com>

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 <miquel.raynal@bootlin.com>
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 <nobuhiro1.iwamatsu@toshiba.co.jp>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
 drivers/mtd/nand/sunxi_nand.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff mbox series

Patch

--- 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;
 	}