1 files changed, 49 insertions, 11 deletions

diff --git a/sound/core/compress_offload.c b/sound/core/compress_offload.c
index 99b882158705..41905afada63 100644
--- a/sound/core/compress_offload.c
+++ b/sound/core/compress_offload.c
@@ -574,10 +574,7 @@ snd_compr_set_params(struct snd_compr_stream *stream, unsigned long arg)
                 stream->metadata_set = false;
                 stream->next_track = false;
 
-                if (stream->direction == SND_COMPRESS_PLAYBACK)
-                        stream->runtime->state = SNDRV_PCM_STATE_SETUP;
-                else
-                        stream->runtime->state = SNDRV_PCM_STATE_PREPARED;
+                stream->runtime->state = SNDRV_PCM_STATE_SETUP;
         } else {
                 return -EPERM;
         }
@@ -693,8 +690,17 @@ static int snd_compr_start(struct snd_compr_stream *stream)
 {
         int retval;
 
-        if (stream->runtime->state != SNDRV_PCM_STATE_PREPARED)
+        switch (stream->runtime->state) {
+        case SNDRV_PCM_STATE_SETUP:
+                if (stream->direction != SND_COMPRESS_CAPTURE)
+                        return -EPERM;
+                break;
+        case SNDRV_PCM_STATE_PREPARED:
+                break;
+        default:
                 return -EPERM;
+        }
+
         retval = stream->ops->trigger(stream, SNDRV_PCM_TRIGGER_START);
         if (!retval)
                 stream->runtime->state = SNDRV_PCM_STATE_RUNNING;
@@ -705,9 +711,15 @@ static int snd_compr_stop(struct snd_compr_stream *stream)
 {
         int retval;
 
-        if (stream->runtime->state == SNDRV_PCM_STATE_PREPARED ||
-                        stream->runtime->state == SNDRV_PCM_STATE_SETUP)
+        switch (stream->runtime->state) {
+        case SNDRV_PCM_STATE_OPEN:
+        case SNDRV_PCM_STATE_SETUP:
+        case SNDRV_PCM_STATE_PREPARED:
                 return -EPERM;
+        default:
+                break;
+        }
+
         retval = stream->ops->trigger(stream, SNDRV_PCM_TRIGGER_STOP);
         if (!retval) {
                 snd_compr_drain_notify(stream);
@@ -795,9 +807,17 @@ static int snd_compr_drain(struct snd_compr_stream *stream)
 {
         int retval;
 
-        if (stream->runtime->state == SNDRV_PCM_STATE_PREPARED ||
-                        stream->runtime->state == SNDRV_PCM_STATE_SETUP)
+        switch (stream->runtime->state) {
+        case SNDRV_PCM_STATE_OPEN:
+        case SNDRV_PCM_STATE_SETUP:
+        case SNDRV_PCM_STATE_PREPARED:
+        case SNDRV_PCM_STATE_PAUSED:
                 return -EPERM;
+        case SNDRV_PCM_STATE_XRUN:
+                return -EPIPE;
+        default:
+                break;
+        }
 
         retval = stream->ops->trigger(stream, SND_COMPR_TRIGGER_DRAIN);
         if (retval) {
@@ -817,6 +837,10 @@ static int snd_compr_next_track(struct snd_compr_stream *stream)
         if (stream->runtime->state != SNDRV_PCM_STATE_RUNNING)
                 return -EPERM;
 
+        /* next track doesn't have any meaning for capture streams */
+        if (stream->direction == SND_COMPRESS_CAPTURE)
+                return -EPERM;
+
         /* you can signal next track if this is intended to be a gapless stream
          * and current track metadata is set
          */
@@ -834,9 +858,23 @@ static int snd_compr_next_track(struct snd_compr_stream *stream)
 static int snd_compr_partial_drain(struct snd_compr_stream *stream)
 {
         int retval;
-        if (stream->runtime->state == SNDRV_PCM_STATE_PREPARED ||
-                        stream->runtime->state == SNDRV_PCM_STATE_SETUP)
+
+        switch (stream->runtime->state) {
+        case SNDRV_PCM_STATE_OPEN:
+        case SNDRV_PCM_STATE_SETUP:
+        case SNDRV_PCM_STATE_PREPARED:
+        case SNDRV_PCM_STATE_PAUSED:
+                return -EPERM;
+        case SNDRV_PCM_STATE_XRUN:
+                return -EPIPE;
+        default:
+                break;
+        }
+
+        /* partial drain doesn't have any meaning for capture streams */
+        if (stream->direction == SND_COMPRESS_CAPTURE)
                 return -EPERM;
+
         /* stream can be drained only when next track has been signalled */
         if (stream->next_track == false)
                 return -EPERM;