lkml.org 
[lkml]   [2019]   [May]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.14 046/193] ASoC: hdmi-codec: unlock the device on startup errors
    Date
    [ Upstream commit 30180e8436046344b12813dc954b2e01dfdcd22d ]

    If the hdmi codec startup fails, it should clear the current_substream
    pointer to free the device. This is properly done for the audio_startup()
    callback but for snd_pcm_hw_constraint_eld().

    Make sure the pointer cleared if an error is reported.

    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/codecs/hdmi-codec.c | 6 +++++-
    1 file changed, 5 insertions(+), 1 deletion(-)

    diff --git a/sound/soc/codecs/hdmi-codec.c b/sound/soc/codecs/hdmi-codec.c
    index 7406695ee5dc2..e00f5f49f21d1 100644
    --- a/sound/soc/codecs/hdmi-codec.c
    +++ b/sound/soc/codecs/hdmi-codec.c
    @@ -446,8 +446,12 @@ static int hdmi_codec_startup(struct snd_pcm_substream *substream,
    if (!ret) {
    ret = snd_pcm_hw_constraint_eld(substream->runtime,
    hcp->eld);
    - if (ret)
    + if (ret) {
    + mutex_lock(&hcp->current_stream_lock);
    + hcp->current_stream = NULL;
    + mutex_unlock(&hcp->current_stream_lock);
    return ret;
    + }
    }
    /* Select chmap supported */
    hdmi_codec_eld_chmap(hcp);
    --
    2.20.1


    \
     
     \ /
      Last update: 2019-05-30 05:36    [W:7.913 / U:0.024 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site