1 files changed, 24 insertions, 13 deletions

diff --git a/drivers/media/video/em28xx/em28xx-audio.c b/drivers/media/video/em28xx/em28xx-audio.c
index ac3292d7646c..dfac2e042a52 100644
--- a/drivers/media/video/em28xx/em28xx-audio.c
+++ b/drivers/media/video/em28xx/em28xx-audio.c
@@ -75,7 +75,9 @@ static void em28xx_audio_isocirq(struct urb *urb)
         struct em28xx            *dev = urb->context;
         int                      i;
         unsigned int             oldptr;
+#ifdef NO_PCM_LOCK
         unsigned long            flags;
+#endif
         int                      period_elapsed = 0;
         int                      status;
         unsigned char            *cp;
@@ -96,9 +98,26 @@ static void em28xx_audio_isocirq(struct urb *urb)
                         if (!length)
                                 continue;
 
+#ifdef NO_PCM_LOCK
                         spin_lock_irqsave(&dev->adev->slock, flags);
-
+#endif
                         oldptr = dev->adev->hwptr_done_capture;
+                        if (oldptr + length >= runtime->buffer_size) {
+                                unsigned int cnt =
+                                    runtime->buffer_size - oldptr;
+                                memcpy(runtime->dma_area + oldptr * stride, cp,
+                                       cnt * stride);
+                                memcpy(runtime->dma_area, cp + cnt * stride,
+                                       length * stride - cnt * stride);
+                        } else {
+                                memcpy(runtime->dma_area + oldptr * stride, cp,
+                                       length * stride);
+                        }
+
+#ifndef NO_PCM_LOCK
+                        snd_pcm_stream_lock(substream);
+#endif
+
                         dev->adev->hwptr_done_capture += length;
                         if (dev->adev->hwptr_done_capture >=
                             runtime->buffer_size)
@@ -113,19 +132,11 @@ static void em28xx_audio_isocirq(struct urb *urb)
                                 period_elapsed = 1;
                         }
 
+#ifdef NO_PCM_LOCK
                         spin_unlock_irqrestore(&dev->adev->slock, flags);
-
-                        if (oldptr + length >= runtime->buffer_size) {
-                                unsigned int cnt =
-                                    runtime->buffer_size - oldptr;
-                                memcpy(runtime->dma_area + oldptr * stride, cp,
-                                       cnt * stride);
-                                memcpy(runtime->dma_area, cp + cnt * stride,
-                                       length * stride - cnt * stride);
-                        } else {
-                                memcpy(runtime->dma_area + oldptr * stride, cp,
-                                       length * stride);
-                        }
+#else
+                        snd_pcm_stream_unlock(substream);
+#endif
                 }
                 if (period_elapsed)
                         snd_pcm_period_elapsed(substream);