6.14-stable patches

added patches:
	comedi-jr3_pci-fix-synchronous-deletion-of-timer.patch

diff --git a/queue-6.14/comedi-jr3_pci-fix-synchronous-deletion-of-timer.patch b/queue-6.14/comedi-jr3_pci-fix-synchronous-deletion-of-timer.patch
new file mode 100644 (file)
index 0000000..8c0a895
--- /dev/null
+++ b/queue-6.14/comedi-jr3_pci-fix-synchronous-deletion-of-timer.patch
@@ -0,0 +1,36 @@
+From 44d9b3f584c59a606b521e7274e658d5b866c699 Mon Sep 17 00:00:00 2001
+From: Ian Abbott <abbotti@mev.co.uk>
+Date: Tue, 15 Apr 2025 13:39:01 +0100
+Subject: comedi: jr3_pci: Fix synchronous deletion of timer
+
+From: Ian Abbott <abbotti@mev.co.uk>
+
+commit 44d9b3f584c59a606b521e7274e658d5b866c699 upstream.
+
+When `jr3_pci_detach()` is called during device removal, it calls
+`timer_delete_sync()` to stop the timer, but the timer expiry function
+always reschedules the timer, so the synchronization is ineffective.
+
+Call `timer_shutdown_sync()` instead.  It does not matter that the timer
+expiry function pointer is cleared, because the device is being removed.
+
+Fixes: 07b509e6584a5 ("Staging: comedi: add jr3_pci driver")
+Cc: stable <stable@kernel.org>
+Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
+Link: https://lore.kernel.org/r/20250415123901.13483-1-abbotti@mev.co.uk
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/comedi/drivers/jr3_pci.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/comedi/drivers/jr3_pci.c
++++ b/drivers/comedi/drivers/jr3_pci.c
+@@ -758,7 +758,7 @@ static void jr3_pci_detach(struct comedi
+       struct jr3_pci_dev_private *devpriv = dev->private;
+ 
+       if (devpriv)
+-              del_timer_sync(&devpriv->timer);
++              timer_shutdown_sync(&devpriv->timer);
+ 
+       comedi_pci_detach(dev);
+ }

diff --git a/queue-6.14/series b/queue-6.14/series
index 6c65020bc101103886a1531554ac2f46e0bad984..18a6d2704e264cceb956ff2631576ff5606302c5 100644 (file)
--- a/queue-6.14/series
+++ b/queue-6.14/series
@@ -297,3 +297,4 @@ revert-drivers-core-synchronize-really_probe-and-dev_uevent.patch
 driver-core-introduce-device_set_driver-helper.patch
 driver-core-fix-potential-null-pointer-dereference-in-dev_uevent.patch
 vmxnet3-fix-malformed-packet-sizing-in-vmxnet3_process_xdp.patch
+comedi-jr3_pci-fix-synchronous-deletion-of-timer.patch