Commit 273925c7 authored by Sebastian Andrzej Siewior's avatar Sebastian Andrzej Siewior Committed by Greg Kroah-Hartman

media: em28xx-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.

Cc: Mauro Carvalho Chehab <mchehab@kernel.org>
Signed-off-by: default avatarSebastian Andrzej Siewior <bigeasy@linutronix.de>
Acked-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 57361846
...@@ -116,6 +116,7 @@ static void em28xx_audio_isocirq(struct urb *urb) ...@@ -116,6 +116,7 @@ static void em28xx_audio_isocirq(struct urb *urb)
stride = runtime->frame_bits >> 3; stride = runtime->frame_bits >> 3;
for (i = 0; i < urb->number_of_packets; i++) { for (i = 0; i < urb->number_of_packets; i++) {
unsigned long flags;
int length = int length =
urb->iso_frame_desc[i].actual_length / stride; urb->iso_frame_desc[i].actual_length / stride;
cp = (unsigned char *)urb->transfer_buffer + cp = (unsigned char *)urb->transfer_buffer +
...@@ -137,7 +138,7 @@ static void em28xx_audio_isocirq(struct urb *urb) ...@@ -137,7 +138,7 @@ static void em28xx_audio_isocirq(struct urb *urb)
length * stride); length * stride);
} }
snd_pcm_stream_lock(substream); snd_pcm_stream_lock_irqsave(substream, flags);
dev->adev.hwptr_done_capture += length; dev->adev.hwptr_done_capture += length;
if (dev->adev.hwptr_done_capture >= if (dev->adev.hwptr_done_capture >=
...@@ -153,7 +154,7 @@ static void em28xx_audio_isocirq(struct urb *urb) ...@@ -153,7 +154,7 @@ static void em28xx_audio_isocirq(struct urb *urb)
period_elapsed = 1; period_elapsed = 1;
} }
snd_pcm_stream_unlock(substream); snd_pcm_stream_unlock_irqrestore(substream, flags);
} }
if (period_elapsed) if (period_elapsed)
snd_pcm_period_elapsed(substream); snd_pcm_period_elapsed(substream);
......
...@@ -777,6 +777,7 @@ EXPORT_SYMBOL_GPL(em28xx_set_mode); ...@@ -777,6 +777,7 @@ EXPORT_SYMBOL_GPL(em28xx_set_mode);
static void em28xx_irq_callback(struct urb *urb) static void em28xx_irq_callback(struct urb *urb)
{ {
struct em28xx *dev = urb->context; struct em28xx *dev = urb->context;
unsigned long flags;
int i; int i;
switch (urb->status) { switch (urb->status) {
...@@ -793,9 +794,9 @@ static void em28xx_irq_callback(struct urb *urb) ...@@ -793,9 +794,9 @@ static void em28xx_irq_callback(struct urb *urb)
} }
/* Copy data from URB */ /* Copy data from URB */
spin_lock(&dev->slock); spin_lock_irqsave(&dev->slock, flags);
dev->usb_ctl.urb_data_copy(dev, urb); dev->usb_ctl.urb_data_copy(dev, urb);
spin_unlock(&dev->slock); spin_unlock_irqrestore(&dev->slock, flags);
/* Reset urb buffers */ /* Reset urb buffers */
for (i = 0; i < urb->number_of_packets; i++) { for (i = 0; i < urb->number_of_packets; i++) {
......
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