diff options
| author | Stefan Hajnoczi <stefanha@gmail.com> | 2011-12-10 02:12:31 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-12-09 19:26:09 -0800 |
| commit | 665f3f506b1c2684d6f78d6d03c038d1712e561d (patch) | |
| tree | be05667a4ad2417a3853178d9e06c9ff8cae67f1 /drivers/staging/line6 | |
| parent | 188e664502dc47f83775a556e6db52cd8cc0b5fc (diff) | |
staging: line6: wait for urbs in snd_line6_prepare()
The .trigger() pcm callbacks are not allowed to block and cannot wait
until urbs have completed. We need to ensure that stopping, preparing,
and then restarting a stream always works.
Currently the driver will sometimes return -EBUSY when restarting the
stream because urbs have not completed yet. This can be triggered by
jackd from userspace.
The solution is to wait on urbs in the .prepare() pcm callback since
blocking is allowed in that callback. This guarantees that all urbs are
quiesced and ready to be submitted when the start trigger callback is
invoked.
Signed-off-by: Stefan Hajnoczi <stefanha@gmail.com>
Signed-off-by: Markus Grabner <grabner@icg.tugraz.at>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/line6')
| -rw-r--r-- | drivers/staging/line6/pcm.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/drivers/staging/line6/pcm.c b/drivers/staging/line6/pcm.c index c3e5002c2af5..68727b2dfb8f 100644 --- a/drivers/staging/line6/pcm.c +++ b/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; |