Skip to content

Commit

Permalink
media: usbtv: 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: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
  • Loading branch information
Sebastian Andrzej Siewior authored and Mauro Carvalho Chehab committed Aug 2, 2018
1 parent a4733b5 commit 320905b
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions drivers/media/usb/usbtv/usbtv-audio.c
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,7 @@ static void usbtv_audio_urb_received(struct urb *urb)
struct snd_pcm_runtime *runtime = substream->runtime;
size_t i, frame_bytes, chunk_length, buffer_pos, period_pos;
int period_elapsed;
unsigned long flags;
void *urb_current;

switch (urb->status) {
Expand Down Expand Up @@ -179,12 +180,12 @@ static void usbtv_audio_urb_received(struct urb *urb)
}
}

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

chip->snd_buffer_pos = buffer_pos;
chip->snd_period_pos = period_pos;

snd_pcm_stream_unlock(substream);
snd_pcm_stream_unlock_irqrestore(substream, flags);

if (period_elapsed)
snd_pcm_period_elapsed(substream);
Expand Down

0 comments on commit 320905b

Please sign in to comment.