drop queue-4.4/mtd-rawnand-sunxi-fix-the-probe-error-path.patch

diff --git a/queue-4.4/mtd-rawnand-sunxi-fix-the-probe-error-path.patch b/queue-4.4/mtd-rawnand-sunxi-fix-the-probe-error-path.patch
deleted file mode 100644 (file)
index b0a5123..0000000
--- a/queue-4.4/mtd-rawnand-sunxi-fix-the-probe-error-path.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 3d84515ffd8fb657e10fa5b1215e9f095fa7efca Mon Sep 17 00:00:00 2001
-From: Miquel Raynal <miquel.raynal@bootlin.com>
-Date: Tue, 19 May 2020 15:00:26 +0200
-Subject: mtd: rawnand: sunxi: Fix the probe error path
-
-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(-)
-
---- a/drivers/mtd/nand/sunxi_nand.c
-+++ b/drivers/mtd/nand/sunxi_nand.c
-@@ -1376,7 +1376,7 @@ static int sunxi_nand_chip_init(struct d
-       ret = mtd_device_parse_register(mtd, NULL, &ppdata, NULL, 0);
-       if (ret) {
-               dev_err(dev, "failed to register mtd device: %d\n", ret);
--              nand_release(mtd);
-+              nand_cleanup(mtd);
-               return ret;
-       }
- 

diff --git a/queue-4.4/series b/queue-4.4/series
index 1f96765aaffafa109d3aa5dac1852461c641f588..c38201d19539f40e798993c5d7503b590639dc6b 100644 (file)
--- a/queue-4.4/series
+++ b/queue-4.4/series
@@ -24,4 +24,3 @@ platform-x86-thinkpad_acpi-initialize-tp_nvram_state-variable.patch
 platform-x86-thinkpad_acpi-re-initialize-acpi-buffer-size-when-reuse.patch
 driver-core-fix-probe_count-imbalance-in-really_probe.patch
 perf-top-fix-stdio-interface-input-handling-with-glibc-2.28.patch
-mtd-rawnand-sunxi-fix-the-probe-error-path.patch