Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 320905ba authored by Sebastian Andrzej Siewior's avatar Sebastian Andrzej Siewior Committed by Mauro Carvalho Chehab
Browse files

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: default avatarSebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
parent a4733b52

drivers/media/usb/usbtv/usbtv-audio.c

+3 −2
Original line number Diff line number Diff line
@@ -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);