drop 4.18 mmc patch

diff --git a/queue-4.18/mmc-meson-mx-sdio-fix-of-child-node-lookup.patch b/queue-4.18/mmc-meson-mx-sdio-fix-of-child-node-lookup.patch
deleted file mode 100644 (file)
index f4c41d2..0000000
--- a/queue-4.18/mmc-meson-mx-sdio-fix-of-child-node-lookup.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From c483a5cc9d09f4ceaa9abb106f863cc89cb643d9 Mon Sep 17 00:00:00 2001
-From: Johan Hovold <johan@kernel.org>
-Date: Mon, 27 Aug 2018 10:21:48 +0200
-Subject: mmc: meson-mx-sdio: fix OF child-node lookup
-
-From: Johan Hovold <johan@kernel.org>
-
-commit c483a5cc9d09f4ceaa9abb106f863cc89cb643d9 upstream.
-
-Use the new of_get_compatible_child() helper to lookup the slot child
-node instead of using of_find_compatible_node(), which searches the
-entire tree from a given start node and thus can return an unrelated
-(i.e. non-child) node.
-
-This also addresses a potential use-after-free (e.g. after probe
-deferral) as the tree-wide helper drops a reference to its first
-argument (i.e. the node of the device being probed).
-
-While at it, also fix up the related slot-node reference leak.
-
-Fixes: ed80a13bb4c4 ("mmc: meson-mx-sdio: Add a driver for the Amlogic Meson8 and Meson8b SoCs")
-Cc: stable <stable@vger.kernel.org>     # 4.15
-Cc: Carlo Caione <carlo@endlessm.com>
-Cc: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
-Cc: Ulf Hansson <ulf.hansson@linaro.org>
-Acked-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
-Signed-off-by: Johan Hovold <johan@kernel.org>
-Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- drivers/mmc/host/meson-mx-sdio.c |    8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
---- a/drivers/mmc/host/meson-mx-sdio.c
-+++ b/drivers/mmc/host/meson-mx-sdio.c
-@@ -517,19 +517,23 @@ static struct mmc_host_ops meson_mx_mmc_
- static struct platform_device *meson_mx_mmc_slot_pdev(struct device *parent)
- {
-       struct device_node *slot_node;
-+      struct platform_device *pdev;
- 
-       /*
-        * TODO: the MMC core framework currently does not support
-        * controllers with multiple slots properly. So we only register
-        * the first slot for now
-        */
--      slot_node = of_find_compatible_node(parent->of_node, NULL, "mmc-slot");
-+      slot_node = of_get_compatible_child(parent->of_node, "mmc-slot");
-       if (!slot_node) {
-               dev_warn(parent, "no 'mmc-slot' sub-node found\n");
-               return ERR_PTR(-ENOENT);
-       }
- 
--      return of_platform_device_create(slot_node, NULL, parent);
-+      pdev = of_platform_device_create(slot_node, NULL, parent);
-+      of_node_put(slot_node);
-+
-+      return pdev;
- }
- 
- static int meson_mx_mmc_add_host(struct meson_mx_mmc_host *host)

diff --git a/queue-4.18/series b/queue-4.18/series
index 0310db0f5f002d702e02b0cc57097d26bb346641..5da282911df2ac4543837cec89147524149ebfb1 100644 (file)
--- a/queue-4.18/series
+++ b/queue-4.18/series
@@ -101,7 +101,6 @@ pstore-fix-incorrect-persistent-ram-buffer-mapping.patch
 xen-netfront-fix-waiting-for-xenbus-state-change.patch
 ib-ipoib-avoid-a-race-condition-between-start_xmit-and-cm_rep_handler.patch
 s390-crypto-fix-return-code-checking-in-cbc_paes_crypt.patch
-mmc-meson-mx-sdio-fix-of-child-node-lookup.patch
 mmc-omap_hsmmc-fix-wakeirq-handling-on-removal.patch
 ipmi-rework-smi-registration-failure.patch
 ipmi-move-bt-capabilities-detection-to-the-detect-call.patch