drop 4.4 mtd patch

diff --git a/queue-4.4/mtd-nand-gpmi-fix-gpmi_nand_init-error-path.patch b/queue-4.4/mtd-nand-gpmi-fix-gpmi_nand_init-error-path.patch
deleted file mode 100644 (file)
index f4efe30..0000000
--- a/queue-4.4/mtd-nand-gpmi-fix-gpmi_nand_init-error-path.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From foo@baz Tue Apr 10 10:31:53 CEST 2018
-From: Boris Brezillon <boris.brezillon@free-electrons.com>
-Date: Mon, 10 Apr 2017 10:35:17 +0200
-Subject: mtd: nand: gpmi: Fix gpmi_nand_init() error path
-
-From: Boris Brezillon <boris.brezillon@free-electrons.com>
-
-
-[ Upstream commit 4d02423e9afe6c46142ce98bbcaf5167316dbfbf ]
-
-The GPMI driver is wrongly assuming that nand_release() can safely be
-called on an uninitialized/unregistered NAND device.
-
-Add a new err_nand_cleanup label in the error path and only execute if
-nand_scan_tail() succeeded.
-
-Note that we now call nand_cleanup() instead of nand_release()
-(nand_release() is actually grouping the mtd_device_unregister() and
-nand_cleanup() in one call) because there's no point in trying to
-unregister a device that has never been registered.
-
-Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
-Reviewed-by: Marek Vasut <marek.vasut@gmail.com>
-Acked-by: Han Xu <han.xu@nxp.com>
-Reviewed-by: Marek Vasut <marek.vasut@gmail.com>
-Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/mtd/nand/gpmi-nand/gpmi-nand.c |   10 ++++++----
- 1 file changed, 6 insertions(+), 4 deletions(-)
-
---- a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
-+++ b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
-@@ -1949,19 +1949,21 @@ static int gpmi_nand_init(struct gpmi_na
- 
-       ret = nand_boot_init(this);
-       if (ret)
--              goto err_out;
-+              goto err_nand_cleanup;
-       ret = chip->scan_bbt(mtd);
-       if (ret)
--              goto err_out;
-+              goto err_nand_cleanup;
- 
-       ppdata.of_node = this->pdev->dev.of_node;
-       ret = mtd_device_parse_register(mtd, NULL, &ppdata, NULL, 0);
-       if (ret)
--              goto err_out;
-+              goto err_nand_cleanup;
-       return 0;
- 
-+err_nand_cleanup:
-+      nand_cleanup(chip);
- err_out:
--      gpmi_nand_exit(this);
-+      gpmi_free_dma_buffer(this);
-       return ret;
- }
- 

diff --git a/queue-4.4/series b/queue-4.4/series
index a596b5bfd8bb9dbb3b0412fcef2c3bcae8b31ac7..498f72911236c2278b058d41df89976c29911ef7 100644 (file)
--- a/queue-4.4/series
+++ b/queue-4.4/series
@@ -103,7 +103,6 @@ rtc-opal-handle-disabled-tpo-in-opal_get_tpo_time.patch
 rtc-interface-validate-alarm-time-before-handling-rollover.patch
 sunrpc-ensure-correct-error-is-reported-by-xs_tcp_setup_socket.patch
 net-freescale-fix-potential-null-pointer-dereference.patch
-mtd-nand-gpmi-fix-gpmi_nand_init-error-path.patch
 kvm-svm-do-not-zero-out-segment-attributes-if-segment-is-unusable-or-not-present.patch
 clk-scpi-fix-return-type-of-__scpi_dvfs_round_rate.patch
 clk-fix-__set_clk_rates-error-print-string.patch