6.1-stable patches

added patches:
	mmc-f-sdh30-fix-order-of-function-calls-in-sdhci_f_sdh30_remove.patch

diff --git a/queue-6.1/mmc-f-sdh30-fix-order-of-function-calls-in-sdhci_f_sdh30_remove.patch b/queue-6.1/mmc-f-sdh30-fix-order-of-function-calls-in-sdhci_f_sdh30_remove.patch
new file mode 100644 (file)
index 0000000..3ec69d7
--- /dev/null
+++ b/queue-6.1/mmc-f-sdh30-fix-order-of-function-calls-in-sdhci_f_sdh30_remove.patch
@@ -0,0 +1,49 @@
+From 58abdd80b93b09023ca03007b608685c41e3a289 Mon Sep 17 00:00:00 2001
+From: Yangtao Li <frank.li@vivo.com>
+Date: Thu, 27 Jul 2023 15:00:51 +0800
+Subject: mmc: f-sdh30: fix order of function calls in sdhci_f_sdh30_remove
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+From: Yangtao Li <frank.li@vivo.com>
+
+commit 58abdd80b93b09023ca03007b608685c41e3a289 upstream.
+
+The order of function calls in sdhci_f_sdh30_remove is wrong,
+let's call sdhci_pltfm_unregister first.
+
+Cc: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
+Fixes: 5def5c1c15bf ("mmc: sdhci-f-sdh30: Replace with sdhci_pltfm")
+Signed-off-by: Yangtao Li <frank.li@vivo.com>
+Reported-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
+Acked-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
+Acked-by: Adrian Hunter <adrian.hunter@intel.com>
+Cc: stable@vger.kernel.org
+Link: https://lore.kernel.org/r/20230727070051.17778-62-frank.li@vivo.com
+Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/mmc/host/sdhci_f_sdh30.c |    8 +++++---
+ 1 file changed, 5 insertions(+), 3 deletions(-)
+
+--- a/drivers/mmc/host/sdhci_f_sdh30.c
++++ b/drivers/mmc/host/sdhci_f_sdh30.c
+@@ -188,12 +188,14 @@ static int sdhci_f_sdh30_remove(struct p
+ {
+       struct sdhci_host *host = platform_get_drvdata(pdev);
+       struct f_sdhost_priv *priv = sdhci_f_sdhost_priv(host);
+-
+-      clk_disable_unprepare(priv->clk_iface);
+-      clk_disable_unprepare(priv->clk);
++      struct clk *clk_iface = priv->clk_iface;
++      struct clk *clk = priv->clk;
+ 
+       sdhci_pltfm_unregister(pdev);
+ 
++      clk_disable_unprepare(clk_iface);
++      clk_disable_unprepare(clk);
++
+       return 0;
+ }
+ 

diff --git a/queue-6.1/series b/queue-6.1/series
index efe23ac9c2f951b007f1f6c5918cdded1866b93e..1d0a7e97948374ae425c141db2e34f591ef3bad0 100644 (file)
--- a/queue-6.1/series
+++ b/queue-6.1/series
@@ -191,3 +191,4 @@ drm-amdgpu-keep-irq-count-in-amdgpu_irq_disable_all.patch
 af_unix-fix-null-ptr-deref-in-unix_stream_sendpage.patch
 drm-nouveau-disp-fix-use-after-free-in-error-handling-of-nouveau_connector_create.patch
 net-fix-the-rto-timer-retransmitting-skb-every-1ms-if-linear-option-is-enabled.patch
+mmc-f-sdh30-fix-order-of-function-calls-in-sdhci_f_sdh30_remove.patch