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

Commit 397d5aee authored by Jarkko Nikula's avatar Jarkko Nikula Committed by Mark Brown
Browse files

ASoC: WM8990: Fix kcontrol's private value use in put callback 



Function wm899x_outpga_put_volsw_vu misuses the kcontrol's private value
by still accessing it as bitfields even SOC_SINGLE_VALUE constructs it
as a pointer into struct soc_mixer_control after the commit
4eaa9819.

This is very similar fix than fix to TLV320AIC3X codec made by
Eero Nurkkala <ext-eero.nurkkala@nokia.com>. This fix is compile tested
only.

Signed-off-by: default avatarJarkko Nikula <jarkko.nikula@nokia.com>
Cc: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 4453dba5

sound/soc/codecs/wm8990.c

+3 −1
Original line number Diff line number Diff line
@@ -176,7 +176,9 @@ static int wm899x_outpga_put_volsw_vu(struct snd_kcontrol *kcontrol, 
	struct snd_ctl_elem_value *ucontrol)

{

	struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);

	int reg = kcontrol->private_value & 0xff;

	struct soc_mixer_control *mc =

		(struct soc_mixer_control *)kcontrol->private_value;

	int reg = mc->reg;

	int ret;

	u16 val;