Commit 8e6a75c1 authored by Lars-Peter Clausen's avatar Lars-Peter Clausen Committed by Mark Brown

ASoC: da732x: Fix control-less DAPM routes

Routes without a control must use NULL for the control name. The da732x
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 da732x 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>
Acked-by: default avatarAdam Thomson <Adam.Thomson.Opensource@diasemi.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
Cc: stable@vger.kernel.org
parent c517d838
...@@ -876,11 +876,11 @@ static const struct snd_soc_dapm_widget da732x_dapm_widgets[] = { ...@@ -876,11 +876,11 @@ static const struct snd_soc_dapm_widget da732x_dapm_widgets[] = {
static const struct snd_soc_dapm_route da732x_dapm_routes[] = { static const struct snd_soc_dapm_route da732x_dapm_routes[] = {
/* Inputs */ /* Inputs */
{"AUX1L PGA", "NULL", "AUX1L"}, {"AUX1L PGA", NULL, "AUX1L"},
{"AUX1R PGA", "NULL", "AUX1R"}, {"AUX1R PGA", NULL, "AUX1R"},
{"MIC1 PGA", NULL, "MIC1"}, {"MIC1 PGA", NULL, "MIC1"},
{"MIC2 PGA", "NULL", "MIC2"}, {"MIC2 PGA", NULL, "MIC2"},
{"MIC3 PGA", "NULL", "MIC3"}, {"MIC3 PGA", NULL, "MIC3"},
/* Capture Path */ /* Capture Path */
{"ADC1 Left MUX", "MIC1", "MIC1 PGA"}, {"ADC1 Left MUX", "MIC1", "MIC1 PGA"},
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment