]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
ASoC: fix valid stream condition
authorJerome Brunet <jbrunet@baylibre.com>
Mon, 29 Apr 2019 09:47:49 +0000 (11:47 +0200)
committerKhalid Elmously <khalid.elmously@canonical.com>
Fri, 14 Feb 2020 05:29:37 +0000 (00:29 -0500)
BugLink: https://bugs.launchpad.net/bugs/1863019
[ Upstream commit 6a7c59c6d9f3b280e81d7a04bbe4e55e90152dce ]

A stream may specify a rate range using 'rate_min' and 'rate_max', so a
stream may be valid and not specify any rates. However, as stream cannot
be valid and not have any channel. Let's use this condition instead to
determine if a stream is valid or not.

Fixes: cde79035c6cf ("ASoC: Handle multiple codecs with split playback / capture")
Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Khalid Elmously <khalid.elmously@canonical.com>
sound/soc/soc-pcm.c

index d37ef0855b85704c435557ff01d4eb096c43fa4e..f7221e407724b6ffc6a88493275d5312bf1d002b 100644 (file)
@@ -48,8 +48,8 @@ static bool snd_soc_dai_stream_valid(struct snd_soc_dai *dai, int stream)
        else
                codec_stream = &dai->driver->capture;
 
-       /* If the codec specifies any rate at all, it supports the stream. */
-       return codec_stream->rates;
+       /* If the codec specifies any channels at all, it supports the stream */
+       return codec_stream->channels_min;
 }
 
 /**