aboutsummaryrefslogtreecommitdiff
path: root/drivers/media
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2008-12-01 18:04:14 -0200
committerMauro Carvalho Chehab <mchehab@redhat.com>2008-12-01 18:04:14 -0200
commita693b0cdba94f60f7ed43754d2c34151cdd11da5 (patch)
tree99cbf46748dfa4f35acc1d63ae51817f3e17ec9d /drivers/media
parent484ab62c5ee805c2bdc405a85a4e64da2722690f (diff)
em28xx: remove backward compat macro added on a previous fix
commit 50f3beb50abe0cc0228363af804e50e710b3e5b0 fixed em28xx-alsa locking schema. However, a backport macro was kept. This patch removes the macro, since it is not needed for the module compilation against upstream. Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/video/em28xx/em28xx-audio.c12
1 files changed, 0 insertions, 12 deletions
diff --git a/drivers/media/video/em28xx/em28xx-audio.c b/drivers/media/video/em28xx/em28xx-audio.c
index 90236bbfe66..7a8d49ef646 100644
--- a/drivers/media/video/em28xx/em28xx-audio.c
+++ b/drivers/media/video/em28xx/em28xx-audio.c
@@ -75,9 +75,6 @@ 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;
@@ -98,9 +95,6 @@ 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 =
@@ -114,9 +108,7 @@ static void em28xx_audio_isocirq(struct urb *urb)
length * stride);
}
-#ifndef NO_PCM_LOCK
snd_pcm_stream_lock(substream);
-#endif
dev->adev->hwptr_done_capture += length;
if (dev->adev->hwptr_done_capture >=
@@ -132,11 +124,7 @@ static void em28xx_audio_isocirq(struct urb *urb)
period_elapsed = 1;
}
-#ifdef NO_PCM_LOCK
- spin_unlock_irqrestore(&dev->adev->slock, flags);
-#else
snd_pcm_stream_unlock(substream);
-#endif
}
if (period_elapsed)
snd_pcm_period_elapsed(substream);