Complete() will be run with interrupt enabled, so disable local
interrupt before holding a global lock which is held without
irqsave.
Cc: Mauro Carvalho Chehab <mche...@redhat.com>
Cc: linux-media@vger.kernel.org
Signed-off-by: Ming Lei <ming....@canonical.com>
---
drivers/media/usb/tlg2300/pd-alsa.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/drivers/media/usb/tlg2300/pd-alsa.c
b/drivers/media/usb/tlg2300/pd-alsa.c
index 3f3e141..cbccc96 100644
--- a/drivers/media/usb/tlg2300/pd-alsa.c
+++ b/drivers/media/usb/tlg2300/pd-alsa.c
@@ -141,6 +141,7 @@ static inline void handle_audio_data(struct urb *urb, int
*period_elapsed)
int len = urb->actual_length / stride;
unsigned char *cp = urb->transfer_buffer;
unsigned int oldptr = pa->rcv_position;
+ unsigned long flags;
if (urb->actual_length == AUDIO_BUF_SIZE - 4)
len -= (AUDIO_TRAILER_SIZE / stride);
@@ -156,6 +157,7 @@ static inline void handle_audio_data(struct urb *urb, int
*period_elapsed)
memcpy(runtime->dma_area + oldptr * stride, cp, len * stride);
/* update the statas */
+ local_irq_save(flags);
snd_pcm_stream_lock(pa->capture_pcm_substream);
pa->rcv_position += len;
if (pa->rcv_position >= runtime->buffer_size)
@@ -167,6 +169,7 @@ static inline void handle_audio_data(struct urb *urb, int
*period_elapsed)
*period_elapsed = 1;
}
snd_pcm_stream_unlock(pa->capture_pcm_substream);
+ local_irq_restore(flags);
}
static void complete_handler_audio(struct urb *urb)
--
1.7.9.5
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
