projects / thirdparty / kernel / stable-queue.git / blame
| Commit | Line | Data |
|---|---|---|
| 0a212480 GKH |
1 | From ce9594c6b332fd6fe464e22a83b0e6e0a287aac6 Mon Sep 17 00:00:00 2001 |
| 2 | From: Lars-Peter Clausen <lars@metafoo.de> | |
| 3 | Date: Fri, 27 Feb 2015 14:13:02 +0100 | |
| 4 | Subject: ASoC: ak4671: Fix control-less DAPM routes | |
| 5 | ||
| 6 | From: Lars-Peter Clausen <lars@metafoo.de> | |
| 7 | ||
| 8 | commit ce9594c6b332fd6fe464e22a83b0e6e0a287aac6 upstream. | |
| 9 | ||
| 10 | Routes without a control must use NULL for the control name. The ak4671 | |
| 11 | driver uses "NULL" instead in a few places. Previous to commit 5fe5b767dc6f | |
| 12 | ("ASoC: dapm: Do not pretend to support controls for non mixer/mux widgets") | |
| 13 | the DAPM core silently ignored non-NULL controls on non-mixer and non-mux | |
| 14 | routes. But starting with that commit it will complain and not add the | |
| 15 | route breaking the ak4671 driver in the process. | |
| 16 | ||
| 17 | This patch replaces the incorrect "NULL" control name with NULL to fix the | |
| 18 | issue. | |
| 19 | ||
| 20 | Fixes: 5fe5b767dc6f ("ASoC: dapm: Do not pretend to support controls for non mixer/mux widgets") | |
| 21 | Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> | |
| 22 | Signed-off-by: Mark Brown <broonie@kernel.org> | |
| 23 | Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> | |
| 24 | ||
| 25 | --- | |
| 26 | sound/soc/codecs/ak4671.c | 44 ++++++++++++++++++++++---------------------- | |
| 27 | 1 file changed, 22 insertions(+), 22 deletions(-) | |
| 28 | ||
| 29 | --- a/sound/soc/codecs/ak4671.c | |
| 30 | +++ b/sound/soc/codecs/ak4671.c | |
| 31 | @@ -343,25 +343,25 @@ static const struct snd_soc_dapm_widget | |
| 32 | }; | |
| 33 | ||
| 34 | static const struct snd_soc_dapm_route ak4671_intercon[] = { | |
| 35 | - {"DAC Left", "NULL", "PMPLL"}, | |
| 36 | - {"DAC Right", "NULL", "PMPLL"}, | |
| 37 | - {"ADC Left", "NULL", "PMPLL"}, | |
| 38 | - {"ADC Right", "NULL", "PMPLL"}, | |
| 39 | + {"DAC Left", NULL, "PMPLL"}, | |
| 40 | + {"DAC Right", NULL, "PMPLL"}, | |
| 41 | + {"ADC Left", NULL, "PMPLL"}, | |
| 42 | + {"ADC Right", NULL, "PMPLL"}, | |
| 43 | ||
| 44 | /* Outputs */ | |
| 45 | - {"LOUT1", "NULL", "LOUT1 Mixer"}, | |
| 46 | - {"ROUT1", "NULL", "ROUT1 Mixer"}, | |
| 47 | - {"LOUT2", "NULL", "LOUT2 Mix Amp"}, | |
| 48 | - {"ROUT2", "NULL", "ROUT2 Mix Amp"}, | |
| 49 | - {"LOUT3", "NULL", "LOUT3 Mixer"}, | |
| 50 | - {"ROUT3", "NULL", "ROUT3 Mixer"}, | |
| 51 | + {"LOUT1", NULL, "LOUT1 Mixer"}, | |
| 52 | + {"ROUT1", NULL, "ROUT1 Mixer"}, | |
| 53 | + {"LOUT2", NULL, "LOUT2 Mix Amp"}, | |
| 54 | + {"ROUT2", NULL, "ROUT2 Mix Amp"}, | |
| 55 | + {"LOUT3", NULL, "LOUT3 Mixer"}, | |
| 56 | + {"ROUT3", NULL, "ROUT3 Mixer"}, | |
| 57 | ||
| 58 | {"LOUT1 Mixer", "DACL", "DAC Left"}, | |
| 59 | {"ROUT1 Mixer", "DACR", "DAC Right"}, | |
| 60 | {"LOUT2 Mixer", "DACHL", "DAC Left"}, | |
| 61 | {"ROUT2 Mixer", "DACHR", "DAC Right"}, | |
| 62 | - {"LOUT2 Mix Amp", "NULL", "LOUT2 Mixer"}, | |
| 63 | - {"ROUT2 Mix Amp", "NULL", "ROUT2 Mixer"}, | |
| 64 | + {"LOUT2 Mix Amp", NULL, "LOUT2 Mixer"}, | |
| 65 | + {"ROUT2 Mix Amp", NULL, "ROUT2 Mixer"}, | |
| 66 | {"LOUT3 Mixer", "DACSL", "DAC Left"}, | |
| 67 | {"ROUT3 Mixer", "DACSR", "DAC Right"}, | |
| 68 | ||
| 69 | @@ -381,18 +381,18 @@ static const struct snd_soc_dapm_route a | |
| 70 | {"LIN2", NULL, "Mic Bias"}, | |
| 71 | {"RIN2", NULL, "Mic Bias"}, | |
| 72 | ||
| 73 | - {"ADC Left", "NULL", "LIN MUX"}, | |
| 74 | - {"ADC Right", "NULL", "RIN MUX"}, | |
| 75 | + {"ADC Left", NULL, "LIN MUX"}, | |
| 76 | + {"ADC Right", NULL, "RIN MUX"}, | |
| 77 | ||
| 78 | /* Analog Loops */ | |
| 79 | - {"LIN1 Mixing Circuit", "NULL", "LIN1"}, | |
| 80 | - {"RIN1 Mixing Circuit", "NULL", "RIN1"}, | |
| 81 | - {"LIN2 Mixing Circuit", "NULL", "LIN2"}, | |
| 82 | - {"RIN2 Mixing Circuit", "NULL", "RIN2"}, | |
| 83 | - {"LIN3 Mixing Circuit", "NULL", "LIN3"}, | |
| 84 | - {"RIN3 Mixing Circuit", "NULL", "RIN3"}, | |
| 85 | - {"LIN4 Mixing Circuit", "NULL", "LIN4"}, | |
| 86 | - {"RIN4 Mixing Circuit", "NULL", "RIN4"}, | |
| 87 | + {"LIN1 Mixing Circuit", NULL, "LIN1"}, | |
| 88 | + {"RIN1 Mixing Circuit", NULL, "RIN1"}, | |
| 89 | + {"LIN2 Mixing Circuit", NULL, "LIN2"}, | |
| 90 | + {"RIN2 Mixing Circuit", NULL, "RIN2"}, | |
| 91 | + {"LIN3 Mixing Circuit", NULL, "LIN3"}, | |
| 92 | + {"RIN3 Mixing Circuit", NULL, "RIN3"}, | |
| 93 | + {"LIN4 Mixing Circuit", NULL, "LIN4"}, | |
| 94 | + {"RIN4 Mixing Circuit", NULL, "RIN4"}, | |
| 95 | ||
| 96 | {"LOUT1 Mixer", "LINL1", "LIN1 Mixing Circuit"}, | |
| 97 | {"ROUT1 Mixer", "RINR1", "RIN1 Mixing Circuit"}, |