Commit 665f3f50 authored Dec 10, 2011 by Stefan Hajnoczi Committed by Greg Kroah-Hartman Dec 09, 2011

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>

parent 188e6645

drivers/staging/line6/pcm.c

+14 −0

Original line number	Diff line number	Diff line
		@@ -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;

Admin message