OSDN Git Service

ASoC: hdmi-codec: stream is already locked in hw_params
authorJerome Brunet <jbrunet@baylibre.com>
Mon, 29 Apr 2019 13:29:40 +0000 (15:29 +0200)
committerMark Brown <broonie@kernel.org>
Fri, 3 May 2019 05:54:43 +0000 (14:54 +0900)
startup() should have run before hw_params() is called, so the
current_substream pointer should already be properly set. There
is no reason to call hdmi_codec_new_stream() again in the
hw_params() callback

Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/codecs/hdmi-codec.c

index b9d9dde..ef6d695 100644 (file)
@@ -492,10 +492,6 @@ static int hdmi_codec_hw_params(struct snd_pcm_substream *substream,
                return ret;
        }
 
-       ret = hdmi_codec_new_stream(substream, dai);
-       if (ret)
-               return ret;
-
        hdmi_audio_infoframe_init(&hp.cea);
        hp.cea.channels = params_channels(params);
        hp.cea.coding_type = HDMI_AUDIO_CODING_TYPE_STREAM;