mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-21 16:29:59 +00:00
media: usbtv: 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: 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>
This commit is contained in:
parent
a4733b5248
commit
320905baa1
1 changed files with 3 additions and 2 deletions
|
@ -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) {
|
||||
|
@ -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);
|
||||
|
|
Loading…
Reference in a new issue