summaryrefslogtreecommitdiffstats
path: root/sound/drivers
diff options
context:
space:
mode:
authorJaroslav Kysela <perex@perex.cz>2010-09-30 00:16:50 +0200
committerJaroslav Kysela <perex@perex.cz>2010-09-30 00:20:17 +0200
commit20d9a26dbbbec32aa7c9da49b979f201bd7104b9 (patch)
tree3e62375a017c13d4b458c2d42121c943f64d16f2 /sound/drivers
parent1446c5fba73044a1c72153e1203b23b1820431c5 (diff)
downloadlinux-20d9a26dbbbec32aa7c9da49b979f201bd7104b9.tar.gz
linux-20d9a26dbbbec32aa7c9da49b979f201bd7104b9.tar.bz2
linux-20d9a26dbbbec32aa7c9da49b979f201bd7104b9.zip
ALSA: snd-aloop - fix capture buffer silence
In a special case, some old samples are left in the capture ring buffer. Fix it. Signed-off-by: Jaroslav Kysela <perex@perex.cz>
Diffstat (limited to 'sound/drivers')
-rw-r--r--sound/drivers/aloop.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/sound/drivers/aloop.c b/sound/drivers/aloop.c
index f2b8f868d97a..2748fee8d405 100644
--- a/sound/drivers/aloop.c
+++ b/sound/drivers/aloop.c
@@ -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