diff options
| author | Charles Keepax <ckeepax@opensource.cirrus.com> | 2019-07-22 10:24:36 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2019-07-23 12:07:48 +0200 |
| commit | 3b8179944cb0dd53e5223996966746cdc8a60657 (patch) | |
| tree | 765b6fb6e07ef6a5967bfe7e83a9fa5384d42591 /sound/core/compress_offload.c | |
| parent | a70ab8a8645083f3700814e757f2940a88b7ef88 (diff) | |
| download | linux-3b8179944cb0dd53e5223996966746cdc8a60657.tar.gz linux-3b8179944cb0dd53e5223996966746cdc8a60657.tar.bz2 linux-3b8179944cb0dd53e5223996966746cdc8a60657.zip | |
ALSA: compress: Be more restrictive about when a drain is allowed
Draining makes little sense in the situation of hardware overrun, as the
hardware will have consumed all its available samples. Additionally,
draining whilst the stream is paused would presumably get stuck as no
data is being consumed on the DSP side.
Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com>
Acked-by: Vinod Koul <vkoul@kernel.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/core/compress_offload.c')
| -rw-r--r-- | sound/core/compress_offload.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/sound/core/compress_offload.c b/sound/core/compress_offload.c index 6cf5b8440cf3..41905afada63 100644 --- a/sound/core/compress_offload.c +++ b/sound/core/compress_offload.c @@ -811,7 +811,10 @@ static int snd_compr_drain(struct snd_compr_stream *stream) 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; } @@ -860,7 +863,10 @@ static int snd_compr_partial_drain(struct snd_compr_stream *stream) 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; } |