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

Commit c3c9b370 authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: bells: Fix up git patch application failure 



It seems git has been getting confused by the very similar contexts
for the speaker DAIs and has been applying patches to the wrong places
causing all sorts of confusion.  Fix this up by hand.

Reported-by: default avatarCharles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 6268f749

sound/soc/samsung/bells.c

+2 −2
Original line number Diff line number Diff line
@@ -212,7 +212,7 @@ static struct snd_soc_dai_link bells_dai_wm5102[] = { 
	{

		.name = "Sub",

		.stream_name = "Sub",

		.cpu_dai_name = "wm5110-aif3",

		.cpu_dai_name = "wm5102-aif3",

		.codec_dai_name = "wm9081-hifi",

		.codec_name = "wm9081.1-006c",

		.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
@@ -247,7 +247,7 @@ static struct snd_soc_dai_link bells_dai_wm5110[] = { 
	{

		.name = "Sub",

		.stream_name = "Sub",

		.cpu_dai_name = "wm5102-aif3",

		.cpu_dai_name = "wm5110-aif3",

		.codec_dai_name = "wm9081-hifi",

		.codec_name = "wm9081.1-006c",

		.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF