]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
6.12-stable patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 3 Dec 2025 13:34:05 +0000 (14:34 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 3 Dec 2025 13:34:05 +0000 (14:34 +0100)
added patches:
spi-spi-nxp-fspi-check-return-value-of-devm_mutex_init.patch

queue-6.12/series
queue-6.12/spi-spi-nxp-fspi-check-return-value-of-devm_mutex_init.patch [new file with mode: 0644]

index c4e7d6492f0142b152f0f5a794374b5982db7a9e..4d697d24678bfcff806e762579b26ceb9acdc3c0 100644 (file)
@@ -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 (file)
index 0000000..18c06e2
--- /dev/null
@@ -0,0 +1,40 @@
+From d24a54e032021cf381af3c3cf119cc5cf6b3c1be Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Thomas=20Wei=C3=9Fschuh?= <linux@weissschuh.net>
+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 <linux@weissschuh.net>
+
+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 <linux@weissschuh.net>
+Reviewed-by: Mark Brown <broonie@kernel.org>
+Signed-off-by: Boqun Feng <boqun.feng@gmail.com>
+Link: https://lore.kernel.org/r/20250617-must_check-devm_mutex_init-v7-1-d9e449f4d224@weissschuh.net
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ 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;