Skip to content

Commit

Permalink
media: em28xx-audio: use irqsave() in USB's complete callback
Browse files Browse the repository at this point in the history
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: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Acked-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Sebastian Andrzej Siewior authored and gregkh committed Sep 10, 2018
1 parent 5736184 commit 273925c
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
5 changes: 3 additions & 2 deletions drivers/media/usb/em28xx/em28xx-audio.c
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,7 @@ static void em28xx_audio_isocirq(struct urb *urb)
stride = runtime->frame_bits >> 3;

for (i = 0; i < urb->number_of_packets; i++) {
unsigned long flags;
int length =
urb->iso_frame_desc[i].actual_length / stride;
cp = (unsigned char *)urb->transfer_buffer +
Expand All @@ -137,7 +138,7 @@ static void em28xx_audio_isocirq(struct urb *urb)
length * stride);
}

snd_pcm_stream_lock(substream);
snd_pcm_stream_lock_irqsave(substream, flags);

dev->adev.hwptr_done_capture += length;
if (dev->adev.hwptr_done_capture >=
Expand All @@ -153,7 +154,7 @@ static void em28xx_audio_isocirq(struct urb *urb)
period_elapsed = 1;
}

snd_pcm_stream_unlock(substream);
snd_pcm_stream_unlock_irqrestore(substream, flags);
}
if (period_elapsed)
snd_pcm_period_elapsed(substream);
Expand Down
5 changes: 3 additions & 2 deletions drivers/media/usb/em28xx/em28xx-core.c
Original file line number Diff line number Diff line change
Expand Up @@ -777,6 +777,7 @@ EXPORT_SYMBOL_GPL(em28xx_set_mode);
static void em28xx_irq_callback(struct urb *urb)
{
struct em28xx *dev = urb->context;
unsigned long flags;
int i;

switch (urb->status) {
Expand All @@ -793,9 +794,9 @@ static void em28xx_irq_callback(struct urb *urb)
}

/* Copy data from URB */
spin_lock(&dev->slock);
spin_lock_irqsave(&dev->slock, flags);
dev->usb_ctl.urb_data_copy(dev, urb);
spin_unlock(&dev->slock);
spin_unlock_irqrestore(&dev->slock, flags);

/* Reset urb buffers */
for (i = 0; i < urb->number_of_packets; i++) {
Expand Down

0 comments on commit 273925c

Please sign in to comment.