]> nv-tegra.nvidia Code Review - linux-2.6.git/commitdiff
[media] tm6000: remove a check for NO_PCM_LOCK
authorMauro Carvalho Chehab <mchehab@redhat.com>
Wed, 13 Jul 2011 22:15:57 +0000 (19:15 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Wed, 27 Jul 2011 20:55:55 +0000 (17:55 -0300)
This was likely used by some test. There's no sense on keeping it
upstream.

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
drivers/staging/tm6000/tm6000-alsa.c

index 2b96047c29831e70fe6b6119a4cb97e2833548af..a588f299af49839eceddfe3b1735555ab0263f97 100644 (file)
@@ -254,9 +254,7 @@ static int tm6000_fillbuf(struct tm6000_core *core, char *buf, int size)
                memcpy(runtime->dma_area + buf_pos * stride, buf,
                        length * stride);
 
-#ifndef NO_PCM_LOCK
        snd_pcm_stream_lock(substream);
-#endif
 
        chip->buf_pos += length;
        if (chip->buf_pos >= runtime->buffer_size)
@@ -268,9 +266,7 @@ static int tm6000_fillbuf(struct tm6000_core *core, char *buf, int size)
                period_elapsed = 1;
        }
 
-#ifndef NO_PCM_LOCK
        snd_pcm_stream_unlock(substream);
-#endif
 
        if (period_elapsed)
                snd_pcm_period_elapsed(substream);