aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/codecs/wm9712.c
diff options
context:
space:
mode:
authorChen-Yu Tsai <wens@csie.org>2016-11-02 15:35:58 +0800
committerMark Brown <broonie@kernel.org>2016-11-02 09:55:03 -0600
commite411b0b5eb9b65257a050eac333d181d6e00e2c6 (patch)
tree594c649787b942815021fd13a7db9802089d7619 /sound/soc/codecs/wm9712.c
parentLinux 4.9-rc1 (diff)
downloadlinux-dev-e411b0b5eb9b65257a050eac333d181d6e00e2c6.tar.xz
linux-dev-e411b0b5eb9b65257a050eac333d181d6e00e2c6.zip
ASoC: dapm: Support second register for DAPM control updates
To support double channel shared controls split across 2 registers, one for each channel, we must be able to update both registers together. Add a second set of register fields to struct snd_soc_dapm_update, and update the DAPM control writeback (put) callbacks to support this. For codecs that use custom events which call into DAPM to do updates, also clear struct snd_soc_dapm_update before using it, so the second set of fields remains clean. Signed-off-by: Chen-Yu Tsai <wens@csie.org> Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/codecs/wm9712.c')
-rw-r--r--sound/soc/codecs/wm9712.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/wm9712.c b/sound/soc/codecs/wm9712.c
index 557709eac698..85f7c5bb8b82 100644
--- a/sound/soc/codecs/wm9712.c
+++ b/sound/soc/codecs/wm9712.c
@@ -187,7 +187,7 @@ static int wm9712_hp_mixer_put(struct snd_kcontrol *kcontrol,
struct soc_mixer_control *mc =
(struct soc_mixer_control *)kcontrol->private_value;
unsigned int mixer, mask, shift, old;
- struct snd_soc_dapm_update update;
+ struct snd_soc_dapm_update update = { 0 };
bool change;
mixer = mc->shift >> 8;