forked from Minki/linux
media: cx231xx: 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. 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
988b3ae3e0
commit
aa53bf0b03
@ -126,6 +126,7 @@ static void cx231xx_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 +
|
||||
@ -148,7 +149,7 @@ static void cx231xx_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 >=
|
||||
@ -163,7 +164,7 @@ static void cx231xx_audio_isocirq(struct urb *urb)
|
||||
runtime->period_size;
|
||||
period_elapsed = 1;
|
||||
}
|
||||
snd_pcm_stream_unlock(substream);
|
||||
snd_pcm_stream_unlock_irqrestore(substream, flags);
|
||||
}
|
||||
if (period_elapsed)
|
||||
snd_pcm_period_elapsed(substream);
|
||||
@ -216,6 +217,7 @@ static void cx231xx_audio_bulkirq(struct urb *urb)
|
||||
stride = runtime->frame_bits >> 3;
|
||||
|
||||
if (1) {
|
||||
unsigned long flags;
|
||||
int length = urb->actual_length /
|
||||
stride;
|
||||
cp = (unsigned char *)urb->transfer_buffer;
|
||||
@ -234,7 +236,7 @@ static void cx231xx_audio_bulkirq(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 >=
|
||||
@ -249,7 +251,7 @@ static void cx231xx_audio_bulkirq(struct urb *urb)
|
||||
runtime->period_size;
|
||||
period_elapsed = 1;
|
||||
}
|
||||
snd_pcm_stream_unlock(substream);
|
||||
snd_pcm_stream_unlock_irqrestore(substream, flags);
|
||||
}
|
||||
if (period_elapsed)
|
||||
snd_pcm_period_elapsed(substream);
|
||||
|
@ -799,6 +799,7 @@ static void cx231xx_isoc_irq_callback(struct urb *urb)
|
||||
struct cx231xx_video_mode *vmode =
|
||||
container_of(dma_q, struct cx231xx_video_mode, vidq);
|
||||
struct cx231xx *dev = container_of(vmode, struct cx231xx, video_mode);
|
||||
unsigned long flags;
|
||||
int i;
|
||||
|
||||
switch (urb->status) {
|
||||
@ -815,9 +816,9 @@ static void cx231xx_isoc_irq_callback(struct urb *urb)
|
||||
}
|
||||
|
||||
/* Copy data from URB */
|
||||
spin_lock(&dev->video_mode.slock);
|
||||
spin_lock_irqsave(&dev->video_mode.slock, flags);
|
||||
dev->video_mode.isoc_ctl.isoc_copy(dev, urb);
|
||||
spin_unlock(&dev->video_mode.slock);
|
||||
spin_unlock_irqrestore(&dev->video_mode.slock, flags);
|
||||
|
||||
/* Reset urb buffers */
|
||||
for (i = 0; i < urb->number_of_packets; i++) {
|
||||
@ -844,6 +845,7 @@ static void cx231xx_bulk_irq_callback(struct urb *urb)
|
||||
struct cx231xx_video_mode *vmode =
|
||||
container_of(dma_q, struct cx231xx_video_mode, vidq);
|
||||
struct cx231xx *dev = container_of(vmode, struct cx231xx, video_mode);
|
||||
unsigned long flags;
|
||||
|
||||
switch (urb->status) {
|
||||
case 0: /* success */
|
||||
@ -862,9 +864,9 @@ static void cx231xx_bulk_irq_callback(struct urb *urb)
|
||||
}
|
||||
|
||||
/* Copy data from URB */
|
||||
spin_lock(&dev->video_mode.slock);
|
||||
spin_lock_irqsave(&dev->video_mode.slock, flags);
|
||||
dev->video_mode.bulk_ctl.bulk_copy(dev, urb);
|
||||
spin_unlock(&dev->video_mode.slock);
|
||||
spin_unlock_irqrestore(&dev->video_mode.slock, flags);
|
||||
|
||||
/* Reset urb buffers */
|
||||
urb->status = usb_submit_urb(urb, GFP_ATOMIC);
|
||||
|
@ -305,6 +305,7 @@ static void cx231xx_irq_vbi_callback(struct urb *urb)
|
||||
struct cx231xx_video_mode *vmode =
|
||||
container_of(dma_q, struct cx231xx_video_mode, vidq);
|
||||
struct cx231xx *dev = container_of(vmode, struct cx231xx, vbi_mode);
|
||||
unsigned long flags;
|
||||
|
||||
switch (urb->status) {
|
||||
case 0: /* success */
|
||||
@ -321,9 +322,9 @@ static void cx231xx_irq_vbi_callback(struct urb *urb)
|
||||
}
|
||||
|
||||
/* Copy data from URB */
|
||||
spin_lock(&dev->vbi_mode.slock);
|
||||
spin_lock_irqsave(&dev->vbi_mode.slock, flags);
|
||||
dev->vbi_mode.bulk_ctl.bulk_copy(dev, urb);
|
||||
spin_unlock(&dev->vbi_mode.slock);
|
||||
spin_unlock_irqrestore(&dev->vbi_mode.slock, flags);
|
||||
|
||||
/* Reset status */
|
||||
urb->status = 0;
|
||||
|
Loading…
Reference in New Issue
Block a user