aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-12-03 18:08:59 +0000
committerMark Brown <broonie@linaro.org>2013-12-03 18:08:59 +0000
commitd930f0082d30d916e2824ecbcb6d2833607ef696 (patch)
tree458bacf0efa74371aa1bda289ed5a96f31743962
parent1c4b578aa4ea2ef98871dc8ad95acb1fa14f9bcd (diff)
parentfaf6615bf05bc5cecc6e22013b9cb21c77784fd1 (diff)
Merge remote-tracking branch 'asoc/fix/dapm' into asoc-linus
-rw-r--r--include/sound/soc-dapm.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/sound/soc-dapm.h b/include/sound/soc-dapm.h
index 2037c45adfe..56ebdfca627 100644
--- a/include/sound/soc-dapm.h
+++ b/include/sound/soc-dapm.h
@@ -104,7 +104,8 @@ struct device;
SND_SOC_DAPM_INIT_REG_VAL(wreg, wshift, winvert), \
.kcontrol_news = wcontrols, .num_kcontrols = 1}
#define SND_SOC_DAPM_MUX(wname, wreg, wshift, winvert, wcontrols) \
-{ .id = snd_soc_dapm_mux, .name = wname, .reg = wreg, \
+{ .id = snd_soc_dapm_mux, .name = wname, \
+ SND_SOC_DAPM_INIT_REG_VAL(wreg, wshift, winvert), \
.kcontrol_news = wcontrols, .num_kcontrols = 1}
#define SND_SOC_DAPM_VIRT_MUX(wname, wreg, wshift, winvert, wcontrols) \
{ .id = snd_soc_dapm_virt_mux, .name = wname, \