Commit 9b11233d authored by John Ogness's avatar John Ogness Committed by Takashi Iwai

ALSA: usb: caiaq: audio: 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 avatarDaniel Mack <daniel@zonque.org>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 222bce5e
...@@ -636,6 +636,7 @@ static void read_completed(struct urb *urb) ...@@ -636,6 +636,7 @@ static void read_completed(struct urb *urb)
struct device *dev; struct device *dev;
struct urb *out = NULL; struct urb *out = NULL;
int i, frame, len, send_it = 0, outframe = 0; int i, frame, len, send_it = 0, outframe = 0;
unsigned long flags;
size_t offset = 0; size_t offset = 0;
if (urb->status || !info) if (urb->status || !info)
...@@ -672,10 +673,10 @@ static void read_completed(struct urb *urb) ...@@ -672,10 +673,10 @@ static void read_completed(struct urb *urb)
offset += len; offset += len;
if (len > 0) { if (len > 0) {
spin_lock(&cdev->spinlock); spin_lock_irqsave(&cdev->spinlock, flags);
fill_out_urb(cdev, out, &out->iso_frame_desc[outframe]); fill_out_urb(cdev, out, &out->iso_frame_desc[outframe]);
read_in_urb(cdev, urb, &urb->iso_frame_desc[frame]); read_in_urb(cdev, urb, &urb->iso_frame_desc[frame]);
spin_unlock(&cdev->spinlock); spin_unlock_irqrestore(&cdev->spinlock, flags);
check_for_elapsed_periods(cdev, cdev->sub_playback); check_for_elapsed_periods(cdev, cdev->sub_playback);
check_for_elapsed_periods(cdev, cdev->sub_capture); check_for_elapsed_periods(cdev, cdev->sub_capture);
send_it = 1; send_it = 1;
......
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