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

Commit 0e774b0d authored by Takashi Iwai's avatar Takashi Iwai Committed by Sasha Levin
Browse files

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



[ Upstream commit 15c665700bf6f4543f003ac0fbb1e9ec692e93f2 ]

The firmware ctls like "DSP1 Firmware" in wm_adsp codec driver are
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>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarSasha Levin <sasha.levin@oracle.com>
parent 8ace594e

sound/soc/codecs/wm_adsp.c

+4 −4
Original line number Diff line number Diff line
@@ -246,7 +246,7 @@ static int wm_adsp_fw_get(struct snd_kcontrol *kcontrol, 
	struct soc_enum *e = (struct soc_enum *)kcontrol->private_value;

	struct wm_adsp *adsp = snd_soc_codec_get_drvdata(codec);



	ucontrol->value.integer.value[0] = adsp[e->shift_l].fw;

	ucontrol->value.enumerated.item[0] = adsp[e->shift_l].fw;



	return 0;

}
@@ -258,16 +258,16 @@ static int wm_adsp_fw_put(struct snd_kcontrol *kcontrol, 
	struct soc_enum *e = (struct soc_enum *)kcontrol->private_value;

	struct wm_adsp *adsp = snd_soc_codec_get_drvdata(codec);



	if (ucontrol->value.integer.value[0] == adsp[e->shift_l].fw)

	if (ucontrol->value.enumerated.item[0] == adsp[e->shift_l].fw)

		return 0;



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

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

		return -EINVAL;



	if (adsp[e->shift_l].running)

		return -EBUSY;



	adsp[e->shift_l].fw = ucontrol->value.integer.value[0];

	adsp[e->shift_l].fw = ucontrol->value.enumerated.item[0];



	return 0;

}