diff options
Diffstat (limited to 'sound/core/compress_offload.c')
-rw-r--r-- | sound/core/compress_offload.c | 57 |
1 files changed, 8 insertions, 49 deletions
diff --git a/sound/core/compress_offload.c b/sound/core/compress_offload.c index 9d518ac..bea523a 100644 --- a/sound/core/compress_offload.c +++ b/sound/core/compress_offload.c @@ -384,7 +384,8 @@ static unsigned int snd_compr_poll(struct file *f, poll_table *wait) return -EFAULT; mutex_lock(&stream->device->lock); - if (stream->runtime->state == SNDRV_PCM_STATE_OPEN) { + if (stream->runtime->state == SNDRV_PCM_STATE_PAUSED || + stream->runtime->state == SNDRV_PCM_STATE_OPEN) { retval = -EBADFD; goto out; } @@ -679,48 +680,14 @@ static int snd_compr_stop(struct snd_compr_stream *stream) return -EPERM; retval = stream->ops->trigger(stream, SNDRV_PCM_TRIGGER_STOP); if (!retval) { - snd_compr_drain_notify(stream); + stream->runtime->state = SNDRV_PCM_STATE_SETUP; + wake_up(&stream->runtime->sleep); stream->runtime->total_bytes_available = 0; stream->runtime->total_bytes_transferred = 0; } return retval; } -static int snd_compress_wait_for_drain(struct snd_compr_stream *stream) -{ - int ret; - - /* - * We are called with lock held. So drop the lock while we wait for - * drain complete notfication from the driver - * - * It is expected that driver will notify the drain completion and then - * stream will be moved to SETUP state, even if draining resulted in an - * error. We can trigger next track after this. - */ - stream->runtime->state = SNDRV_PCM_STATE_DRAINING; - mutex_unlock(&stream->device->lock); - - /* we wait for drain to complete here, drain can return when - * interruption occurred, wait returned error or success. - * For the first two cases we don't do anything different here and - * return after waking up - */ - - ret = wait_event_interruptible(stream->runtime->sleep, - (stream->runtime->state != SNDRV_PCM_STATE_DRAINING)); - if (ret == -ERESTARTSYS) - pr_debug("wait aborted by a signal"); - else if (ret) - pr_debug("wait for drain failed with %d\n", ret); - - - wake_up(&stream->runtime->sleep); - mutex_lock(&stream->device->lock); - - return ret; -} - static int snd_compr_drain(struct snd_compr_stream *stream) { int retval; @@ -728,15 +695,12 @@ static int snd_compr_drain(struct snd_compr_stream *stream) if (stream->runtime->state == SNDRV_PCM_STATE_PREPARED || stream->runtime->state == SNDRV_PCM_STATE_SETUP) return -EPERM; - retval = stream->ops->trigger(stream, SND_COMPR_TRIGGER_DRAIN); - if (retval) { - pr_debug("SND_COMPR_TRIGGER_DRAIN failed %d\n", retval); + if (!retval) { + stream->runtime->state = SNDRV_PCM_STATE_DRAINING; wake_up(&stream->runtime->sleep); - return retval; } - - return snd_compress_wait_for_drain(stream); + return retval; } static int snd_compr_next_track(struct snd_compr_stream *stream) @@ -772,14 +736,9 @@ static int snd_compr_partial_drain(struct snd_compr_stream *stream) return -EPERM; retval = stream->ops->trigger(stream, SND_COMPR_TRIGGER_PARTIAL_DRAIN); - if (retval) { - pr_debug("Partial drain returned failure\n"); - wake_up(&stream->runtime->sleep); - return retval; - } stream->next_track = false; - return snd_compress_wait_for_drain(stream); + return retval; } static long snd_compr_ioctl(struct file *f, unsigned int cmd, unsigned long arg) |