lkml.org 
[lkml]   [2011]   [Jul]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
Subjectlinux-next: manual merge of the staging tree with the v4l-dvb tree
Hi Greg,

Today's linux-next merge of the staging tree got a conflict in
drivers/staging/tm6000/tm6000-alsa.c between commit 58d73afffaac
("[media] tm6000: remove a check for NO_PCM_LOCK") from the v4l-dvb tree
and commit d684aee316ec ("tm6000: Cleaned up code style in
tm6000-alsa.c") from the staging tree.

I fixed it up (see below) and can carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au

diff --cc drivers/staging/tm6000/tm6000-alsa.c
index 018ff73,ddfd7c3..0000000
--- a/drivers/staging/tm6000/tm6000-alsa.c
+++ b/drivers/staging/tm6000/tm6000-alsa.c
@@@ -254,7 -254,9 +254,7 @@@ static int tm6000_fillbuf(struct tm6000
memcpy(runtime->dma_area + buf_pos * stride, buf,
length * stride);

- snd_pcm_stream_lock(substream);
-#ifndef NO_PCM_LOCK
+ snd_pcm_stream_lock(substream);
-#endif

chip->buf_pos += length;
if (chip->buf_pos >= runtime->buffer_size)
@@@ -266,7 -268,9 +266,7 @@@
period_elapsed = 1;
}

- snd_pcm_stream_unlock(substream);
-#ifndef NO_PCM_LOCK
+ snd_pcm_stream_unlock(substream);
-#endif

if (period_elapsed)
snd_pcm_period_elapsed(substream);


\
 
 \ /
  Last update: 2011-07-16 15:07    [W:0.074 / U:0.360 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site