[PATCH 43/50] sound: usb: midi: spin_lock in complete() cleanup
From: Ming Lei <hidden>
Date: 2013-07-11 09:12:21
Also in:
alsa-devel, linux-input, linux-media, linux-wireless
Subsystem:
sound, the rest, usb midi driver · Maintainers:
Jaroslav Kysela, Takashi Iwai, Linus Torvalds, Clemens Ladisch
Complete() will be run with interrupt enabled, so change to spin_lock_irqsave(). Cc: Jaroslav Kysela <perex@perex.cz> Cc: Takashi Iwai <redacted> Cc: Clemens Ladisch <clemens@ladisch.de> Cc: alsa-devel@alsa-project.org Signed-off-by: Ming Lei <redacted> --- sound/usb/midi.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/sound/usb/midi.c b/sound/usb/midi.c
index b901f46..86af276 100644
--- a/sound/usb/midi.c
+++ b/sound/usb/midi.c@@ -279,15 +279,16 @@ static void snd_usbmidi_out_urb_complete(struct urb* urb) struct out_urb_context *context = urb->context; struct snd_usb_midi_out_endpoint* ep = context->ep; unsigned int urb_index; + unsigned long flags; - spin_lock(&ep->buffer_lock); + spin_lock_irqsave(&ep->buffer_lock, flags); urb_index = context - ep->urbs; ep->active_urbs &= ~(1 << urb_index); if (unlikely(ep->drain_urbs)) { ep->drain_urbs &= ~(1 << urb_index); wake_up(&ep->drain_wait); } - spin_unlock(&ep->buffer_lock); + spin_unlock_irqrestore(&ep->buffer_lock, flags); if (urb->status < 0) { int err = snd_usbmidi_urb_error(urb->status); if (err < 0) {
--
1.7.9.5