Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ed6a2772 authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: wm8994: Fix class W controls 



Commit 6e0650 (ASoC: wm8994: Use SOC_SINGLE_EXT() instead of open-coding
it) went too far and converted a DAPM control to use SOC_SINGLE_EXT()
which crashes.  Revert that portion of the patch.

Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent 087ee093

sound/soc/codecs/wm8994.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -1433,7 +1433,7 @@ SOC_DAPM_SINGLE("AIF1.1 Switch", WM8994_DAC2_RIGHT_MIXER_ROUTING, 




#define WM8994_CLASS_W_SWITCH(xname, reg, shift, max, invert) \

#define WM8994_CLASS_W_SWITCH(xname, reg, shift, max, invert) \

	SOC_SINGLE_EXT(xname, reg, shift, max, invert, \

	SOC_SINGLE_EXT(xname, reg, shift, max, invert, \

		snd_soc_get_volsw, wm8994_put_class_w)

		snd_soc_dapm_get_volsw, wm8994_put_class_w)





static int wm8994_put_class_w(struct snd_kcontrol *kcontrol,

static int wm8994_put_class_w(struct snd_kcontrol *kcontrol,

			      struct snd_ctl_elem_value *ucontrol)

			      struct snd_ctl_elem_value *ucontrol)