Commit 1259d239 authored by John Ogness's avatar John Ogness Committed by Takashi Iwai

ALSA: usb-midi: use irqsave() in USB's complete callback

The USB completion callback does not disable interrupts while acquiring
the lock. We want to remove the local_irq_disable() invocation from
__usb_hcd_giveback_urb() and therefore it is required for the callback
handler to disable the interrupts while acquiring the lock.
The callback may be invoked either in IRQ or BH context depending on the
USB host controller.
Use the _irqsave() variant of the locking primitives.
Signed-off-by: default avatarJohn Ogness <john.ogness@linutronix.de>
Signed-off-by: default avatarSebastian Andrzej Siewior <bigeasy@linutronix.de>
Acked-by: default avatarClemens Ladisch <clemens@ladisch.de>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 9b11233d
...@@ -281,15 +281,16 @@ static void snd_usbmidi_out_urb_complete(struct urb *urb) ...@@ -281,15 +281,16 @@ static void snd_usbmidi_out_urb_complete(struct urb *urb)
struct out_urb_context *context = urb->context; struct out_urb_context *context = urb->context;
struct snd_usb_midi_out_endpoint *ep = context->ep; struct snd_usb_midi_out_endpoint *ep = context->ep;
unsigned int urb_index; unsigned int urb_index;
unsigned long flags;
spin_lock(&ep->buffer_lock); spin_lock_irqsave(&ep->buffer_lock, flags);
urb_index = context - ep->urbs; urb_index = context - ep->urbs;
ep->active_urbs &= ~(1 << urb_index); ep->active_urbs &= ~(1 << urb_index);
if (unlikely(ep->drain_urbs)) { if (unlikely(ep->drain_urbs)) {
ep->drain_urbs &= ~(1 << urb_index); ep->drain_urbs &= ~(1 << urb_index);
wake_up(&ep->drain_wait); wake_up(&ep->drain_wait);
} }
spin_unlock(&ep->buffer_lock); spin_unlock_irqrestore(&ep->buffer_lock, flags);
if (urb->status < 0) { if (urb->status < 0) {
int err = snd_usbmidi_urb_error(urb); int err = snd_usbmidi_urb_error(urb);
if (err < 0) { if (err < 0) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment