drop usb-gadget-f_midi-f_midi_complete-to-call-queue_work.patch

diff --git a/queue-5.10/series b/queue-5.10/series
index a06544e1783e93565641228e8bee4a2c724666a5..d8749a25ba4ed55c3551e2fb961f3d845b655943 100644 (file)
--- a/queue-5.10/series
+++ b/queue-5.10/series
@@ -270,7 +270,6 @@ usb-hub-ignore-non-compliant-devices-with-too-many-configs-or-interfaces.patch
 usb-cdc-acm-fill-in-renesas-r-car-d3-usb-download-mode-quirk.patch
 usb-cdc-acm-check-control-transfer-buffer-size-before-access.patch
 usb-cdc-acm-fix-handling-of-oversized-fragments.patch
-usb-gadget-f_midi-f_midi_complete-to-call-queue_work.patch
 usb-serial-option-add-meig-smart-slm828.patch
 usb-serial-option-add-telit-cinterion-fn990b-compositions.patch
 usb-serial-option-fix-telit-cinterion-fn990a-name.patch

diff --git a/queue-5.10/usb-gadget-f_midi-f_midi_complete-to-call-queue_work.patch b/queue-5.10/usb-gadget-f_midi-f_midi_complete-to-call-queue_work.patch
deleted file mode 100644 (file)
index 1078ebb..0000000
--- a/queue-5.10/usb-gadget-f_midi-f_midi_complete-to-call-queue_work.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 4ab37fcb42832cdd3e9d5e50653285ca84d6686f Mon Sep 17 00:00:00 2001
-From: Jill Donahue <jilliandonahue58@gmail.com>
-Date: Tue, 11 Feb 2025 10:48:05 -0700
-Subject: USB: gadget: f_midi: f_midi_complete to call queue_work
-
-From: Jill Donahue <jilliandonahue58@gmail.com>
-
-commit 4ab37fcb42832cdd3e9d5e50653285ca84d6686f upstream.
-
-When using USB MIDI, a lock is attempted to be acquired twice through a
-re-entrant call to f_midi_transmit, causing a deadlock.
-
-Fix it by using queue_work() to schedule the inner f_midi_transmit() via
-a high priority work queue from the completion handler.
-
-Link: https://lore.kernel.org/all/CAArt=LjxU0fUZOj06X+5tkeGT+6RbXzpWg1h4t4Fwa_KGVAX6g@mail.gmail.com/
-Fixes: d5daf49b58661 ("USB: gadget: midi: add midi function driver")
-Cc: stable <stable@kernel.org>
-Signed-off-by: Jill Donahue <jilliandonahue58@gmail.com>
-Link: https://lore.kernel.org/r/20250211174805.1369265-1-jdonahue@fender.com
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/usb/gadget/function/f_midi.c |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/drivers/usb/gadget/function/f_midi.c
-+++ b/drivers/usb/gadget/function/f_midi.c
-@@ -282,7 +282,7 @@ f_midi_complete(struct usb_ep *ep, struc
-                       /* Our transmit completed. See if there's more to go.
-                        * f_midi_transmit eats req, don't queue it again. */
-                       req->length = 0;
--                      f_midi_transmit(midi);
-+                      queue_work(system_highpri_wq, &midi->work);
-                       return;
-               }
-               break;