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

Commit 251d6047 authored by Takashi Iwai's avatar Takashi Iwai Committed by Mark Brown
Browse files

ASoC: wm8985: Fix enum ctl accesses in a wrong type 



"Equalizer Function" ctl in wm8985 codec driver is enum, while the
current driver accesses wrongly via value.integer.value[].  They have
to be via value.enumerated.item[] instead.

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 92e963f5

sound/soc/codecs/wm8985.c

+7 −7
Original line number Diff line number Diff line
@@ -531,9 +531,9 @@ static int eqmode_get(struct snd_kcontrol *kcontrol, 


	reg = snd_soc_read(codec, WM8985_EQ1_LOW_SHELF);

	if (reg & WM8985_EQ3DMODE)

		ucontrol->value.integer.value[0] = 1;

		ucontrol->value.enumerated.item[0] = 1;

	else

		ucontrol->value.integer.value[0] = 0;

		ucontrol->value.enumerated.item[0] = 0;



	return 0;

}
@@ -545,18 +545,18 @@ static int eqmode_put(struct snd_kcontrol *kcontrol, 
	unsigned int regpwr2, regpwr3;

	unsigned int reg_eq;



	if (ucontrol->value.integer.value[0] != 0

			&& ucontrol->value.integer.value[0] != 1)

	if (ucontrol->value.enumerated.item[0] != 0

			&& ucontrol->value.enumerated.item[0] != 1)

		return -EINVAL;



	reg_eq = snd_soc_read(codec, WM8985_EQ1_LOW_SHELF);

	switch ((reg_eq & WM8985_EQ3DMODE) >> WM8985_EQ3DMODE_SHIFT) {

	case 0:

		if (!ucontrol->value.integer.value[0])

		if (!ucontrol->value.enumerated.item[0])

			return 0;

		break;

	case 1:

		if (ucontrol->value.integer.value[0])

		if (ucontrol->value.enumerated.item[0])

			return 0;

		break;

	}
@@ -573,7 +573,7 @@ static int eqmode_put(struct snd_kcontrol *kcontrol, 
	/* set the desired eqmode */

	snd_soc_update_bits(codec, WM8985_EQ1_LOW_SHELF,

			    WM8985_EQ3DMODE_MASK,

			    ucontrol->value.integer.value[0]

			    ucontrol->value.enumerated.item[0]

			    << WM8985_EQ3DMODE_SHIFT);

	/* restore DAC/ADC configuration */

	snd_soc_write(codec, WM8985_POWER_MANAGEMENT_2, regpwr2);