Commit ce9594c6 authored by Lars-Peter Clausen's avatar Lars-Peter Clausen Committed by Mark Brown
Browse files

ASoC: ak4671: Fix control-less DAPM routes 



Routes without a control must use NULL for the control name. The ak4671
driver uses "NULL" instead in a few places. Previous to commit 5fe5b767
("ASoC: dapm: Do not pretend to support controls for non mixer/mux widgets")
the DAPM core silently ignored non-NULL controls on non-mixer and non-mux
routes. But starting with that commit it will complain and not add the
route breaking the ak4671 driver in the process.

This patch replaces the incorrect "NULL" control name with NULL to fix the
issue.

Fixes: 5fe5b767 ("ASoC: dapm: Do not pretend to support controls for non mixer/mux widgets")
Signed-off-by: default avatarLars-Peter Clausen <lars@metafoo.de>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
Cc: stable@vger.kernel.org
parent c517d838

sound/soc/codecs/ak4671.c

+22 −22
Original line number Diff line number Diff line
@@ -343,25 +343,25 @@ static const struct snd_soc_dapm_widget ak4671_dapm_widgets[] = { 
};



static const struct snd_soc_dapm_route ak4671_intercon[] = {

	{"DAC Left", "NULL", "PMPLL"},

	{"DAC Right", "NULL", "PMPLL"},

	{"ADC Left", "NULL", "PMPLL"},

	{"ADC Right", "NULL", "PMPLL"},

	{"DAC Left", NULL, "PMPLL"},

	{"DAC Right", NULL, "PMPLL"},

	{"ADC Left", NULL, "PMPLL"},

	{"ADC Right", NULL, "PMPLL"},



	/* Outputs */

	{"LOUT1", "NULL", "LOUT1 Mixer"},

	{"ROUT1", "NULL", "ROUT1 Mixer"},

	{"LOUT2", "NULL", "LOUT2 Mix Amp"},

	{"ROUT2", "NULL", "ROUT2 Mix Amp"},

	{"LOUT3", "NULL", "LOUT3 Mixer"},

	{"ROUT3", "NULL", "ROUT3 Mixer"},

	{"LOUT1", NULL, "LOUT1 Mixer"},

	{"ROUT1", NULL, "ROUT1 Mixer"},

	{"LOUT2", NULL, "LOUT2 Mix Amp"},

	{"ROUT2", NULL, "ROUT2 Mix Amp"},

	{"LOUT3", NULL, "LOUT3 Mixer"},

	{"ROUT3", NULL, "ROUT3 Mixer"},



	{"LOUT1 Mixer", "DACL", "DAC Left"},

	{"ROUT1 Mixer", "DACR", "DAC Right"},

	{"LOUT2 Mixer", "DACHL", "DAC Left"},

	{"ROUT2 Mixer", "DACHR", "DAC Right"},

	{"LOUT2 Mix Amp", "NULL", "LOUT2 Mixer"},

	{"ROUT2 Mix Amp", "NULL", "ROUT2 Mixer"},

	{"LOUT2 Mix Amp", NULL, "LOUT2 Mixer"},

	{"ROUT2 Mix Amp", NULL, "ROUT2 Mixer"},

	{"LOUT3 Mixer", "DACSL", "DAC Left"},

	{"ROUT3 Mixer", "DACSR", "DAC Right"},
@@ -381,18 +381,18 @@ static const struct snd_soc_dapm_route ak4671_intercon[] = { 
	{"LIN2", NULL, "Mic Bias"},

	{"RIN2", NULL, "Mic Bias"},



	{"ADC Left", "NULL", "LIN MUX"},

	{"ADC Right", "NULL", "RIN MUX"},

	{"ADC Left", NULL, "LIN MUX"},

	{"ADC Right", NULL, "RIN MUX"},



	/* Analog Loops */

	{"LIN1 Mixing Circuit", "NULL", "LIN1"},

	{"RIN1 Mixing Circuit", "NULL", "RIN1"},

	{"LIN2 Mixing Circuit", "NULL", "LIN2"},

	{"RIN2 Mixing Circuit", "NULL", "RIN2"},

	{"LIN3 Mixing Circuit", "NULL", "LIN3"},

	{"RIN3 Mixing Circuit", "NULL", "RIN3"},

	{"LIN4 Mixing Circuit", "NULL", "LIN4"},

	{"RIN4 Mixing Circuit", "NULL", "RIN4"},

	{"LIN1 Mixing Circuit", NULL, "LIN1"},

	{"RIN1 Mixing Circuit", NULL, "RIN1"},

	{"LIN2 Mixing Circuit", NULL, "LIN2"},

	{"RIN2 Mixing Circuit", NULL, "RIN2"},

	{"LIN3 Mixing Circuit", NULL, "LIN3"},

	{"RIN3 Mixing Circuit", NULL, "RIN3"},

	{"LIN4 Mixing Circuit", NULL, "LIN4"},

	{"RIN4 Mixing Circuit", NULL, "RIN4"},



	{"LOUT1 Mixer", "LINL1", "LIN1 Mixing Circuit"},

	{"ROUT1 Mixer", "RINR1", "RIN1 Mixing Circuit"},

CRA Git | Maintained and supported by SUSTech CRA and CCSE