diff --git a/[refs] b/[refs] index dde7e7249eaa..4df749da75b3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a555bb8c6bf6932c5706745bfdbad22df26324d9 +refs/heads/master: 754813473c1a8b7711802313125f0fafc60141f8 diff --git a/trunk/sound/core/compress_offload.c b/trunk/sound/core/compress_offload.c index a0bc47f8dcf7..99db892d7299 100644 --- a/trunk/sound/core/compress_offload.c +++ b/trunk/sound/core/compress_offload.c @@ -311,8 +311,16 @@ static ssize_t snd_compr_read(struct file *f, char __user *buf, stream = &data->stream; mutex_lock(&stream->device->lock); - /* read is allowed when stream is running */ - if (stream->runtime->state != SNDRV_PCM_STATE_RUNNING) { + /* read is allowed when stream is running, paused, draining and setup + * (yes setup is state which we transition to after stop, so if user + * wants to read data after stop we allow that) + */ + switch (stream->runtime->state) { + case SNDRV_PCM_STATE_OPEN: + case SNDRV_PCM_STATE_PREPARED: + case SNDRV_PCM_STATE_XRUN: + case SNDRV_PCM_STATE_SUSPENDED: + case SNDRV_PCM_STATE_DISCONNECTED: retval = -EBADFD; goto out; }