drop mmc-sdhci-msm-fix-dev-reference-leaked-through-of_qcom_ice_get.patch from everywhere

diff --git a/queue-6.12/mmc-sdhci-msm-fix-dev-reference-leaked-through-of_qcom_ice_get.patch b/queue-6.12/mmc-sdhci-msm-fix-dev-reference-leaked-through-of_qcom_ice_get.patch
deleted file mode 100644 (file)
index 920023f..0000000
--- a/queue-6.12/mmc-sdhci-msm-fix-dev-reference-leaked-through-of_qcom_ice_get.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From cbef7442fba510b7eb229dcc9f39d3dde4a159a4 Mon Sep 17 00:00:00 2001
-From: Tudor Ambarus <tudor.ambarus@linaro.org>
-Date: Fri, 17 Jan 2025 14:18:51 +0000
-Subject: mmc: sdhci-msm: fix dev reference leaked through of_qcom_ice_get
-
-From: Tudor Ambarus <tudor.ambarus@linaro.org>
-
-commit cbef7442fba510b7eb229dcc9f39d3dde4a159a4 upstream.
-
-The driver leaks the device reference taken with
-of_find_device_by_node(). Fix the leak by using devm_of_qcom_ice_get().
-
-Fixes: c7eed31e235c ("mmc: sdhci-msm: Switch to the new ICE API")
-Cc: stable@vger.kernel.org
-Signed-off-by: Tudor Ambarus <tudor.ambarus@linaro.org>
-Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
-Acked-by: Ulf Hansson <ulf.hansson@linaro.org>
-Reviewed-by: Abel Vesa <abel.vesa@linaro.org>
-Reviewed-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
-Link: https://lore.kernel.org/r/20250117-qcom-ice-fix-dev-leak-v2-2-1ffa5b6884cb@linaro.org
-Signed-off-by: Bjorn Andersson <andersson@kernel.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/mmc/host/sdhci-msm.c |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/drivers/mmc/host/sdhci-msm.c
-+++ b/drivers/mmc/host/sdhci-msm.c
-@@ -1866,7 +1866,7 @@ static int sdhci_msm_ice_init(struct sdh
-       if (!(cqhci_readl(cq_host, CQHCI_CAP) & CQHCI_CAP_CS))
-               return 0;
- 
--      ice = of_qcom_ice_get(dev);
-+      ice = devm_of_qcom_ice_get(dev);
-       if (ice == ERR_PTR(-EOPNOTSUPP)) {
-               dev_warn(dev, "Disabling inline encryption support\n");
-               ice = NULL;

diff --git a/queue-6.12/series b/queue-6.12/series
index 07beceae0efa2cf1de73af300fb1ec07c486c613..803f0202c8dac31ecd75c69054d20348953af749 100644 (file)
--- a/queue-6.12/series
+++ b/queue-6.12/series
@@ -390,7 +390,6 @@ remove-unnecessary-firmware-version-check-for-gc-v9_4_2.patch
 mmc-omap-fix-memory-leak-in-mmc_omap_new_slot.patch
 mmc-sdhci-pxav3-set-need_rsp_busy-capability.patch
 mmc-sdhci-omap-disable-mmc_cap_aggressive_pm-for-emmc-sd.patch
-mmc-sdhci-msm-fix-dev-reference-leaked-through-of_qcom_ice_get.patch
 kvm-svm-don-t-change-target-vcpu-state-on-ap-creation-vmgexit-error.patch
 ksmbd-add-bounds-check-for-durable-handle-context.patch
 ksmbd-add-bounds-check-for-create-lease-context.patch

diff --git a/queue-6.13/mmc-sdhci-msm-fix-dev-reference-leaked-through-of_qcom_ice_get.patch b/queue-6.13/mmc-sdhci-msm-fix-dev-reference-leaked-through-of_qcom_ice_get.patch
deleted file mode 100644 (file)
index 920023f..0000000
--- a/queue-6.13/mmc-sdhci-msm-fix-dev-reference-leaked-through-of_qcom_ice_get.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From cbef7442fba510b7eb229dcc9f39d3dde4a159a4 Mon Sep 17 00:00:00 2001
-From: Tudor Ambarus <tudor.ambarus@linaro.org>
-Date: Fri, 17 Jan 2025 14:18:51 +0000
-Subject: mmc: sdhci-msm: fix dev reference leaked through of_qcom_ice_get
-
-From: Tudor Ambarus <tudor.ambarus@linaro.org>
-
-commit cbef7442fba510b7eb229dcc9f39d3dde4a159a4 upstream.
-
-The driver leaks the device reference taken with
-of_find_device_by_node(). Fix the leak by using devm_of_qcom_ice_get().
-
-Fixes: c7eed31e235c ("mmc: sdhci-msm: Switch to the new ICE API")
-Cc: stable@vger.kernel.org
-Signed-off-by: Tudor Ambarus <tudor.ambarus@linaro.org>
-Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
-Acked-by: Ulf Hansson <ulf.hansson@linaro.org>
-Reviewed-by: Abel Vesa <abel.vesa@linaro.org>
-Reviewed-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
-Link: https://lore.kernel.org/r/20250117-qcom-ice-fix-dev-leak-v2-2-1ffa5b6884cb@linaro.org
-Signed-off-by: Bjorn Andersson <andersson@kernel.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/mmc/host/sdhci-msm.c |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/drivers/mmc/host/sdhci-msm.c
-+++ b/drivers/mmc/host/sdhci-msm.c
-@@ -1866,7 +1866,7 @@ static int sdhci_msm_ice_init(struct sdh
-       if (!(cqhci_readl(cq_host, CQHCI_CAP) & CQHCI_CAP_CS))
-               return 0;
- 
--      ice = of_qcom_ice_get(dev);
-+      ice = devm_of_qcom_ice_get(dev);
-       if (ice == ERR_PTR(-EOPNOTSUPP)) {
-               dev_warn(dev, "Disabling inline encryption support\n");
-               ice = NULL;

diff --git a/queue-6.13/series b/queue-6.13/series
index 8c90933631febf6e2f0eb2a91480a631fc89d7ea..c2859f1b0d243574f9c0488a3a359326e98ade30 100644 (file)
--- a/queue-6.13/series
+++ b/queue-6.13/series
@@ -462,7 +462,6 @@ remove-unnecessary-firmware-version-check-for-gc-v9_4_2.patch
 mmc-omap-fix-memory-leak-in-mmc_omap_new_slot.patch
 mmc-sdhci-pxav3-set-need_rsp_busy-capability.patch
 mmc-sdhci-omap-disable-mmc_cap_aggressive_pm-for-emmc-sd.patch
-mmc-sdhci-msm-fix-dev-reference-leaked-through-of_qcom_ice_get.patch
 kvm-svm-don-t-change-target-vcpu-state-on-ap-creation-vmgexit-error.patch
 ksmbd-add-bounds-check-for-durable-handle-context.patch
 ksmbd-add-bounds-check-for-create-lease-context.patch

diff --git a/queue-6.14/mmc-sdhci-msm-fix-dev-reference-leaked-through-of_qcom_ice_get.patch b/queue-6.14/mmc-sdhci-msm-fix-dev-reference-leaked-through-of_qcom_ice_get.patch
deleted file mode 100644 (file)
index 40a60a8..0000000
--- a/queue-6.14/mmc-sdhci-msm-fix-dev-reference-leaked-through-of_qcom_ice_get.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From cbef7442fba510b7eb229dcc9f39d3dde4a159a4 Mon Sep 17 00:00:00 2001
-From: Tudor Ambarus <tudor.ambarus@linaro.org>
-Date: Fri, 17 Jan 2025 14:18:51 +0000
-Subject: mmc: sdhci-msm: fix dev reference leaked through of_qcom_ice_get
-
-From: Tudor Ambarus <tudor.ambarus@linaro.org>
-
-commit cbef7442fba510b7eb229dcc9f39d3dde4a159a4 upstream.
-
-The driver leaks the device reference taken with
-of_find_device_by_node(). Fix the leak by using devm_of_qcom_ice_get().
-
-Fixes: c7eed31e235c ("mmc: sdhci-msm: Switch to the new ICE API")
-Cc: stable@vger.kernel.org
-Signed-off-by: Tudor Ambarus <tudor.ambarus@linaro.org>
-Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
-Acked-by: Ulf Hansson <ulf.hansson@linaro.org>
-Reviewed-by: Abel Vesa <abel.vesa@linaro.org>
-Reviewed-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
-Link: https://lore.kernel.org/r/20250117-qcom-ice-fix-dev-leak-v2-2-1ffa5b6884cb@linaro.org
-Signed-off-by: Bjorn Andersson <andersson@kernel.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/mmc/host/sdhci-msm.c |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/drivers/mmc/host/sdhci-msm.c
-+++ b/drivers/mmc/host/sdhci-msm.c
-@@ -1873,7 +1873,7 @@ static int sdhci_msm_ice_init(struct sdh
-       if (!(cqhci_readl(cq_host, CQHCI_CAP) & CQHCI_CAP_CS))
-               return 0;
- 
--      ice = of_qcom_ice_get(dev);
-+      ice = devm_of_qcom_ice_get(dev);
-       if (ice == ERR_PTR(-EOPNOTSUPP)) {
-               dev_warn(dev, "Disabling inline encryption support\n");
-               ice = NULL;

diff --git a/queue-6.14/series b/queue-6.14/series
index 27ad12ab3fd759608d7372fd02066189e731f935..3af7fda874a411d56f2b384ab11a73f286838cff 100644 (file)
--- a/queue-6.14/series
+++ b/queue-6.14/series
@@ -694,7 +694,6 @@ remove-unnecessary-firmware-version-check-for-gc-v9_4_2.patch
 mmc-omap-fix-memory-leak-in-mmc_omap_new_slot.patch
 mmc-sdhci-pxav3-set-need_rsp_busy-capability.patch
 mmc-sdhci-omap-disable-mmc_cap_aggressive_pm-for-emmc-sd.patch
-mmc-sdhci-msm-fix-dev-reference-leaked-through-of_qcom_ice_get.patch
 kvm-svm-don-t-change-target-vcpu-state-on-ap-creation-vmgexit-error.patch
 ksmbd-add-bounds-check-for-durable-handle-context.patch
 ksmbd-add-bounds-check-for-create-lease-context.patch