projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
9c3a473
)
ASoC: topology: Fix to add dapm mixer info
author
Jeeja KP
<jeeja.kp@intel.com>
Tue, 14 Jul 2015 07:40:47 +0000
(13:10 +0530)
committer
Mark Brown
<broonie@kernel.org>
Tue, 14 Jul 2015 09:12:55 +0000
(10:12 +0100)
Mixer control for widgets can't be created if the info is NULL. So assign
the correct info for this.
Signed-off-by: Jeeja KP <jeeja.kp@intel.com>
Signed-off-by: Subhransu S. Prusty <subhransu.s.prusty@intel.com>
Acked-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/soc-topology.c
patch
|
blob
|
history
diff --git
a/sound/soc/soc-topology.c
b/sound/soc/soc-topology.c
index 7a19df313fe82f68cd4d7cc26074ecd927ea99bf..59ac211f8fe7c273c84dcd67ac94bb27cb760564 100644
(file)
--- a/
sound/soc/soc-topology.c
+++ b/
sound/soc/soc-topology.c
@@
-144,7
+144,7
@@
static const struct snd_soc_tplg_kcontrol_ops io_ops[] = {
{SND_SOC_TPLG_CTL_STROBE, snd_soc_get_strobe,
snd_soc_put_strobe, NULL},
{SND_SOC_TPLG_DAPM_CTL_VOLSW, snd_soc_dapm_get_volsw,
- snd_soc_dapm_put_volsw,
NULL
},
+ snd_soc_dapm_put_volsw,
snd_soc_info_volsw
},
{SND_SOC_TPLG_DAPM_CTL_ENUM_DOUBLE, snd_soc_dapm_get_enum_double,
snd_soc_dapm_put_enum_double, snd_soc_info_enum_double},
{SND_SOC_TPLG_DAPM_CTL_ENUM_VIRT, snd_soc_dapm_get_enum_double,