summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorCharles Keepax <ckeepax@opensource.cirrus.com>2019-07-22 10:24:35 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-08-16 10:12:47 +0200
commit30dd700da7de7b1c4f382a7a8637ccc4cae506b9 (patch)
treed8466ec35e5c7748cbe0ae19dfd414ba35b4b3ec /sound
parentf1ea9a6387709a6f13665140f74cd8df0ec9337d (diff)
downloadlinux-stable-30dd700da7de7b1c4f382a7a8637ccc4cae506b9.tar.gz
linux-stable-30dd700da7de7b1c4f382a7a8637ccc4cae506b9.tar.bz2
linux-stable-30dd700da7de7b1c4f382a7a8637ccc4cae506b9.zip
ALSA: compress: Don't allow paritial drain operations on capture streams
[ Upstream commit a70ab8a8645083f3700814e757f2940a88b7ef88 ] Partial drain and next track are intended for gapless playback and don't really have an obvious interpretation for a capture stream, so makes sense to not allow those operations on capture streams. Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com> Acked-by: Vinod Koul <vkoul@kernel.org> Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'sound')
-rw-r--r--sound/core/compress_offload.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/sound/core/compress_offload.c b/sound/core/compress_offload.c
index 5e74f518bd59..9c1684f01aca 100644
--- a/sound/core/compress_offload.c
+++ b/sound/core/compress_offload.c
@@ -835,6 +835,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
*/
@@ -862,6 +866,10 @@ static int snd_compr_partial_drain(struct snd_compr_stream *stream)
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;