diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-09-30 08:42:14 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-09-30 08:42:14 +0200 |
| commit | c76a544feb63b10883acff9a59cd989c6b438cd3 (patch) | |
| tree | 28ae07af3ca8c863d9234f12e492eb96da8c77f0 /sound/drivers | |
| parent | 095a0f6df246bdc57b57d616c4698e41fbd3bf43 (diff) | |
| parent | 20d9a26dbbbec32aa7c9da49b979f201bd7104b9 (diff) | |
| download | linux-c76a544feb63b10883acff9a59cd989c6b438cd3.tar.gz linux-c76a544feb63b10883acff9a59cd989c6b438cd3.tar.bz2 linux-c76a544feb63b10883acff9a59cd989c6b438cd3.zip | |
Merge remote branch 'alsa/devel' into topic/misc
Diffstat (limited to 'sound/drivers')
| -rw-r--r-- | sound/drivers/aloop.c | 6 |
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 |