From 4de1c724cf74fd15843ce63cc3b9bccafa993972 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 3 Dec 2025 14:34:05 +0100 Subject: [PATCH] 6.12-stable patches added patches: spi-spi-nxp-fspi-check-return-value-of-devm_mutex_init.patch --- queue-6.12/series | 1 + ...heck-return-value-of-devm_mutex_init.patch | 40 +++++++++++++++++++ 2 files changed, 41 insertions(+) create mode 100644 queue-6.12/spi-spi-nxp-fspi-check-return-value-of-devm_mutex_init.patch diff --git a/queue-6.12/series b/queue-6.12/series index c4e7d6492f..4d697d2467 100644 --- a/queue-6.12/series +++ b/queue-6.12/series @@ -129,3 +129,4 @@ net-dsa-microchip-free-previously-initialized-ports-on-init-failures.patch wifi-ath12k-correctly-handle-mcast-packets-for-clients.patch revert-acpi-suppress-misleading-spcr-console-message-when-spcr-table-is-absent.patch drm-i915-dp-initialize-the-source-oui-write-timestamp-always.patch +spi-spi-nxp-fspi-check-return-value-of-devm_mutex_init.patch diff --git a/queue-6.12/spi-spi-nxp-fspi-check-return-value-of-devm_mutex_init.patch b/queue-6.12/spi-spi-nxp-fspi-check-return-value-of-devm_mutex_init.patch new file mode 100644 index 0000000000..18c06e2f88 --- /dev/null +++ b/queue-6.12/spi-spi-nxp-fspi-check-return-value-of-devm_mutex_init.patch @@ -0,0 +1,40 @@ +From d24a54e032021cf381af3c3cf119cc5cf6b3c1be Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Thomas=20Wei=C3=9Fschuh?= +Date: Tue, 17 Jun 2025 19:08:12 +0200 +Subject: spi: spi-nxp-fspi: Check return value of devm_mutex_init() +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Thomas Weißschuh + +commit d24a54e032021cf381af3c3cf119cc5cf6b3c1be upstream. + +devm_mutex_init() can fail. With CONFIG_DEBUG_MUTEXES=y the mutex will +be marked as unusable and trigger errors on usage. + +Add the missed check. + +Fixes: 48900813abd2 ("spi: spi-nxp-fspi: remove the goto in probe") +Signed-off-by: Thomas Weißschuh +Reviewed-by: Mark Brown +Signed-off-by: Boqun Feng +Link: https://lore.kernel.org/r/20250617-must_check-devm_mutex_init-v7-1-d9e449f4d224@weissschuh.net +Signed-off-by: Greg Kroah-Hartman +--- + drivers/spi/spi-nxp-fspi.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +--- a/drivers/spi/spi-nxp-fspi.c ++++ b/drivers/spi/spi-nxp-fspi.c +@@ -1249,7 +1249,9 @@ static int nxp_fspi_probe(struct platfor + return dev_err_probe(dev, ret, "Failed to request irq\n"); + } + +- devm_mutex_init(dev, &f->lock); ++ ret = devm_mutex_init(dev, &f->lock); ++ if (ret) ++ return dev_err_probe(dev, ret, "Failed to initialize lock\n"); + + ctlr->bus_num = -1; + ctlr->num_chipselect = NXP_FSPI_MAX_CHIPSELECT; -- 2.47.3