diff options
| author | Mark Brown <broonie@kernel.org> | 2019-05-06 16:51:54 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-05-06 16:51:54 +0300 |
| commit | 378d590c494551a68a824b939c711bb9a280e9ef (patch) | |
| tree | 7481e5902a89c9814666bdc45a3ff9f43f1c4450 /sound/soc/codecs/hdmi-codec.c | |
| parent | 7f5a466f2ea1115a4a73d987b7b6a73d23475305 (diff) | |
| parent | 1587a061ef562de0d97c82a95863e191bcd69d63 (diff) | |
| download | linux-378d590c494551a68a824b939c711bb9a280e9ef.tar.xz | |
Merge branch 'asoc-5.2' into asoc-next
Diffstat (limited to 'sound/soc/codecs/hdmi-codec.c')
| -rw-r--r-- | sound/soc/codecs/hdmi-codec.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/sound/soc/codecs/hdmi-codec.c b/sound/soc/codecs/hdmi-codec.c index fb2f0ac1f16f..39caf19abb0b 100644 --- a/sound/soc/codecs/hdmi-codec.c +++ b/sound/soc/codecs/hdmi-codec.c @@ -496,10 +496,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; @@ -761,7 +757,7 @@ static int hdmi_codec_probe(struct platform_device *pdev) dev_dbg(dev, "%s()\n", __func__); if (!hcd) { - dev_err(dev, "%s: No plalform data\n", __func__); + dev_err(dev, "%s: No platform data\n", __func__); return -EINVAL; } |