diff options
| author | Chen-Yu Tsai <wens@csie.org> | 2016-08-27 19:28:00 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-10-31 04:14:00 -0600 |
| commit | fb257da3e81d53cd373980b317ec0352ad5c151c (patch) | |
| tree | 2cc2637587d5c9033d9e4fb03e0639e920da7dc5 /sound | |
| parent | de0b70569c1ec41b2c7d7464c5dac36ebdf1c735 (diff) | |
| download | linux-stable-fb257da3e81d53cd373980b317ec0352ad5c151c.tar.gz linux-stable-fb257da3e81d53cd373980b317ec0352ad5c151c.tar.bz2 linux-stable-fb257da3e81d53cd373980b317ec0352ad5c151c.zip | |
ASoC: dapm: Fix kcontrol creation for output driver widget
commit a3930ed060df4ccf2a06cf0b68738dec3e6ff89a upstream.
Commit d88429a695a4 ("ASoC: dapm: Add output driver widget") added
the snd_soc_dapm_out_drv ID for the output driver widget, which is
the same as the PGA widget, with a later power sequence number.
Commit 19a2557b76d6 ("ASoC: dapm: Add kcontrol support for PGAs")
then added kcontrol support for PGA widgets, but failed to account
for output driver widgets. Attempts to use kcontrols with output
driver widgets result in silent failures, with the developer having
little idea about what went on.
Add snd_soc_dapm_out_drv to the switch/case block under snd_soc_dapm_pga
in dapm_create_or_share_kcontrol, since they are essentially the same.
Fixes: 19a2557b76d6 (ASoC: dapm: Add kcontrol support for PGAs)
Signed-off-by: Chen-Yu Tsai <wens@csie.org>
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/soc-dapm.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index 368e5044ad88..b8a256dfed7e 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c @@ -823,6 +823,7 @@ static int dapm_create_or_share_kcontrol(struct snd_soc_dapm_widget *w, case snd_soc_dapm_switch: case snd_soc_dapm_mixer: case snd_soc_dapm_pga: + case snd_soc_dapm_out_drv: wname_in_long_name = true; kcname_in_long_name = true; break; |