diff options
| author | Mark Brown <broonie@kernel.org> | 2016-01-11 13:54:27 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-01-11 13:54:27 +0000 |
| commit | b7f08d29c9ef76fb4bc95385e3f90b51e0494a3b (patch) | |
| tree | df0c97e0cacdb1440e63f6ed6db372de163bfac1 /sound | |
| parent | c8980d2c17e40767c0971e0200c645c198a96fe3 (diff) | |
| parent | a1068045883ed4a18363a4ebad0c3d55e473b716 (diff) | |
| download | linux-b7f08d29c9ef76fb4bc95385e3f90b51e0494a3b.tar.bz2 | |
Merge remote-tracking branch 'asoc/fix/compress' into asoc-linus
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/soc-compress.c | 23 |
1 files changed, 20 insertions, 3 deletions
diff --git a/sound/soc/soc-compress.c b/sound/soc/soc-compress.c index 12a9820feac1..bb82bb966000 100644 --- a/sound/soc/soc-compress.c +++ b/sound/soc/soc-compress.c @@ -630,6 +630,7 @@ int snd_soc_new_compress(struct snd_soc_pcm_runtime *rtd, int num) struct snd_pcm *be_pcm; char new_name[64]; int ret = 0, direction = 0; + int playback = 0, capture = 0; if (rtd->num_codecs > 1) { dev_err(rtd->card->dev, "Multicodec not supported for compressed stream\n"); @@ -641,11 +642,27 @@ int snd_soc_new_compress(struct snd_soc_pcm_runtime *rtd, int num) rtd->dai_link->stream_name, codec_dai->name, num); if (codec_dai->driver->playback.channels_min) + playback = 1; + if (codec_dai->driver->capture.channels_min) + capture = 1; + + capture = capture && cpu_dai->driver->capture.channels_min; + playback = playback && cpu_dai->driver->playback.channels_min; + + /* + * Compress devices are unidirectional so only one of the directions + * should be set, check for that (xor) + */ + if (playback + capture != 1) { + dev_err(rtd->card->dev, "Invalid direction for compress P %d, C %d\n", + playback, capture); + return -EINVAL; + } + + if(playback) direction = SND_COMPRESS_PLAYBACK; - else if (codec_dai->driver->capture.channels_min) - direction = SND_COMPRESS_CAPTURE; else - return -EINVAL; + direction = SND_COMPRESS_CAPTURE; compr = kzalloc(sizeof(*compr), GFP_KERNEL); if (compr == NULL) { |