FAILED: patch "[PATCH] mtd: rawnand: oxnas: Fix the probe error path" failed to apply to 4.14-stable tree
Subsystems (3)
[email protected]
maintainerThe patch below does not apply to the 4.14-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 154298e2a3f6c9ce1d76cdb48d89fd5b107ea1a3 Mon Sep 17 00:00:00 2001
From: Miquel Raynal <[email protected]>
Date: Tue, 19 May 2020 15:00:09 +0200
Subject: [PATCH] mtd: rawnand: oxnas: Fix the probe error path
nand_release() is supposed be called after MTD device registration. Here, only nand_scan() happened, so use nand_cleanup() instead.
While at it, be consistent and move the function call in the error path thanks to a goto statement.
Fixes 668592492409 ("mtd: nand: Add OX820 NAND Support")
Signed-off-by Miquel Raynal <[email protected]>
drivers/mtd/nand/raw/oxnas_nand.c +4 -4
@@ -140,10 +140,8 @@ static int oxnas_nand_probe(struct platform_device *pdev) goto err_release_child; err =mtd_device_register (mtd,NULL ,0 ); -if (err) { -nand_release (chip); - goto err_release_child; - } +if (err) + goto err_cleanup_nand; oxnas->chips[oxnas->nchips] = chip; ++oxnas->nchips;
@@ -159,6 +157,8 @@ static int oxnas_nand_probe(struct platform_device *pdev)return 0 ; +err_cleanup_nand: +nand_cleanup (chip); err_release_child:of_node_put (nand_np); err_clk_unprepare: