From 9ceecef79ac5945174ac03ff7f9d6cbe7f16bf17 Mon Sep 17 00:00:00 2001 From: Stefan Hajnoczi Date: Sat, 10 Dec 2011 02:12:31 +0100 Subject: [PATCH] --- yaml --- r: 281340 b: refs/heads/master c: 665f3f506b1c2684d6f78d6d03c038d1712e561d h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/line6/pcm.c | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index c24052f6ed35..5210999eb602 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 188e664502dc47f83775a556e6db52cd8cc0b5fc +refs/heads/master: 665f3f506b1c2684d6f78d6d03c038d1712e561d diff --git a/trunk/drivers/staging/line6/pcm.c b/trunk/drivers/staging/line6/pcm.c index c3e5002c2af5..68727b2dfb8f 100644 --- a/trunk/drivers/staging/line6/pcm.c +++ b/trunk/drivers/staging/line6/pcm.c @@ -474,6 +474,20 @@ int snd_line6_prepare(struct snd_pcm_substream *substream) { struct snd_line6_pcm *line6pcm = snd_pcm_substream_chip(substream); + switch (substream->stream) { + case SNDRV_PCM_STREAM_PLAYBACK: + line6_unlink_wait_clear_audio_out_urbs(line6pcm); + break; + + case SNDRV_PCM_STREAM_CAPTURE: + line6_unlink_wait_clear_audio_in_urbs(line6pcm); + break; + + default: + MISSING_CASE; + } + + if (!test_and_set_bit(BIT_PREPARED, &line6pcm->flags)) { line6pcm->count_out = 0; line6pcm->pos_out = 0;