]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
ALSA: compress: fix the states to check for allowing read
authorVinod Koul <vinod.koul@intel.com>
Mon, 29 Apr 2013 08:55:23 +0000 (14:25 +0530)
committerTakashi Iwai <tiwai@suse.de>
Mon, 29 Apr 2013 11:33:18 +0000 (13:33 +0200)
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>
Reviewed-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
sound/core/compress_offload.c

index a0bc47f8dcf7f3c2502b686983fcfc494c295287..99db892d7299056568e5432bdd660ea14d3143c6 100644 (file)
@@ -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;
        }