lkml.org 
[lkml]   [2020]   [Jan]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 4.9 124/251] ASoC: fix valid stream condition
    Date
    From: Jerome Brunet <jbrunet@baylibre.com>

    [ 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>
    ---
    sound/soc/soc-pcm.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c
    index d69559e45872..635b22fa1101 100644
    --- a/sound/soc/soc-pcm.c
    +++ b/sound/soc/soc-pcm.c
    @@ -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;
    }

    /**
    --
    2.20.1
    \
     
     \ /
      Last update: 2020-01-16 19:09    [W:4.081 / U:0.136 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site