dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

Merge remote branch 'alsa/devel' into topic/misc

This commit is contained in:
Takashi Iwai 2010-09-30 08:42:14 +02:00
parent 095a0f6df2 20d9a26dbb
commit c76a544feb
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sound/drivers/aloop.c
View File

@ -347,7 +347,7 @@ static void copy_play_buf(struct loopback_pcm *play,
unsigned int bytes)
{
struct snd_pcm_runtime *runtime = play->substream->runtime;
char *src = play->substream->runtime->dma_area;
char *src = runtime->dma_area;
char *dst = capt->substream->runtime->dma_area;
unsigned int src_off = play->buf_pos;
unsigned int dst_off = capt->buf_pos;
@ -385,8 +385,10 @@ static void copy_play_buf(struct loopback_pcm *play,
dst_off = (dst_off + size) % capt->pcm_buffer_size;
}
if (clear_bytes > 0)
if (clear_bytes > 0) {
clear_capture_buf(capt, clear_bytes);
capt->silent_size = 0;
}
}
#define BYTEPOS_UPDATE_POSONLY 0