From: Greg Kroah-Hartman Date: Wed, 9 Apr 2025 10:52:18 +0000 (+0200) Subject: 5.15-stable patches X-Git-Tag: v5.4.292~2 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=86e43710efe9b81f690cbdab15e2dab9eb87da2f;p=thirdparty%2Fkernel%2Fstable-queue.git 5.15-stable patches added patches: mmc-sdhci-brcmstb-initialize-base_clk-to-null-in-sdhci_brcmstb_probe.patch --- diff --git a/queue-5.15/mmc-sdhci-brcmstb-initialize-base_clk-to-null-in-sdhci_brcmstb_probe.patch b/queue-5.15/mmc-sdhci-brcmstb-initialize-base_clk-to-null-in-sdhci_brcmstb_probe.patch new file mode 100644 index 0000000000..1db2917de4 --- /dev/null +++ b/queue-5.15/mmc-sdhci-brcmstb-initialize-base_clk-to-null-in-sdhci_brcmstb_probe.patch @@ -0,0 +1,45 @@ +From c3c0ed75ffbff5c70667030b5139bbb75b0a30f5 Mon Sep 17 00:00:00 2001 +From: Nathan Chancellor +Date: Wed, 8 Jun 2022 08:27:57 -0700 +Subject: mmc: sdhci-brcmstb: Initialize base_clk to NULL in sdhci_brcmstb_probe() + +From: Nathan Chancellor + +commit c3c0ed75ffbff5c70667030b5139bbb75b0a30f5 upstream. + +Clang warns a few times along the lines of: + + drivers/mmc/host/sdhci-brcmstb.c:302:6: warning: variable 'base_clk' is used uninitialized whenever 'if' condition is true [-Wsometimes-uninitialized] + if (res) + ^~~ + drivers/mmc/host/sdhci-brcmstb.c:376:24: note: uninitialized use occurs here + clk_disable_unprepare(base_clk); + ^~~~~~~~ + +base_clk is used in the error path before it is initialized. Initialize +it to NULL, as clk_disable_unprepare() calls clk_disable() and +clk_unprepare(), which both handle NULL pointers gracefully. + +Link: https://github.com/ClangBuiltLinux/linux/issues/1650 +Reported-by: kernel test robot +Signed-off-by: Nathan Chancellor +Acked-by: Florian Fainelli +Acked-by: Adrian Hunter +Link: https://lore.kernel.org/r/20220608152757.82529-1-nathan@kernel.org +Signed-off-by: Ulf Hansson +Signed-off-by: Greg Kroah-Hartman +--- + drivers/mmc/host/sdhci-brcmstb.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/mmc/host/sdhci-brcmstb.c ++++ b/drivers/mmc/host/sdhci-brcmstb.c +@@ -257,7 +257,7 @@ static int sdhci_brcmstb_probe(struct pl + struct sdhci_host *host; + struct resource *iomem; + struct clk *clk; +- struct clk *base_clk; ++ struct clk *base_clk = NULL; + int res; + + match = of_match_node(sdhci_brcm_of_match, pdev->dev.of_node); diff --git a/queue-5.15/series b/queue-5.15/series index 9cb2ccc3f2..10903a4273 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -278,3 +278,4 @@ nfsd-skip-sending-cb_recall_any-when-the-backchannel-isn-t-up.patch mmc-sdhci-brcmstb-use-clk_get_rate-base_clk-in-pm-resume.patch mm-slab-remove-duplicate-kernel-doc-comment-for-ksize.patch tracing-do-not-use-perf-enums-when-perf-is-not-defined.patch +mmc-sdhci-brcmstb-initialize-base_clk-to-null-in-sdhci_brcmstb_probe.patch