[alsa-devel] [PATCH] compress: fix the states to check for allowing read
for reading compressed data, we need to allow when we are paused, draining or stopped.
Signed-off-by: Vinod Koul vinod.koul@intel.com Cc: Charles Keepax ckeepax@opensource.wolfsonmicro.com Cc: Richard Fitzgerald rf@opensource.wolfsonmicro.com --- sound/core/compress_offload.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/sound/core/compress_offload.c b/sound/core/compress_offload.c index a0bc47f..7b774b7 100644 --- a/sound/core/compress_offload.c +++ b/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; }
At Mon, 29 Apr 2013 14:25:23 +0530, Vinod Koul wrote:
for reading compressed data, we need to allow when we are paused, draining or stopped.
Signed-off-by: Vinod Koul vinod.koul@intel.com Cc: Charles Keepax ckeepax@opensource.wolfsonmicro.com Cc: Richard Fitzgerald rf@opensource.wolfsonmicro.com
Thanks, applied.
Takashi
sound/core/compress_offload.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/sound/core/compress_offload.c b/sound/core/compress_offload.c index a0bc47f..7b774b7 100644 --- a/sound/core/compress_offload.c +++ b/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; }
-- 1.7.0.4
participants (2)
-
Takashi Iwai
-
Vinod Koul