Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 943fa022 authored by Jeffy Chen's avatar Jeffy Chen Committed by Mark Brown
Browse files

ASoC: hdmi-codec: Use different name for playback streams 



Currently the hdmi i2s playback stream and hdmi spdif playback stream
are using the same name. So when they are enabled at the same time,
kernel will print this warning:

[    2.201835] hdmi-audio-codec hdmi-audio-codec.1.auto: ASoC: Failed to
create Playback debugfs file

Assign different names to them to avoid that.

Signed-off-by: default avatarJeffy Chen <jeffy.chen@rock-chips.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 3013c75f

sound/soc/codecs/hdmi-codec.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -696,7 +696,7 @@ static struct snd_soc_dai_driver hdmi_i2s_dai = { 
	.name = "i2s-hifi",

	.name = "i2s-hifi",

	.id = DAI_ID_I2S,

	.id = DAI_ID_I2S,

	.playback = {

	.playback = {

		.stream_name = "Playback",

		.stream_name = "I2S Playback",

		.channels_min = 2,

		.channels_min = 2,

		.channels_max = 8,

		.channels_max = 8,

		.rates = HDMI_RATES,

		.rates = HDMI_RATES,
@@ -711,7 +711,7 @@ static const struct snd_soc_dai_driver hdmi_spdif_dai = { 
	.name = "spdif-hifi",

	.name = "spdif-hifi",

	.id = DAI_ID_SPDIF,

	.id = DAI_ID_SPDIF,

	.playback = {

	.playback = {

		.stream_name = "Playback",

		.stream_name = "SPDIF Playback",

		.channels_min = 2,

		.channels_min = 2,

		.channels_max = 2,

		.channels_max = 2,

		.rates = HDMI_RATES,

		.rates = HDMI_RATES,