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

Commit b16760bb authored by Sergey Vlasov's avatar Sergey Vlasov Committed by Jaroslav Kysela
Browse files

[ALSA] fix behaviour of ac97_enum_mixer elements 

AC97 Codec
ac97_enum mixer elements (e.g., 'Capture Source') did not work because
of wrong bitmask calculation in snd_ac97_get_enum_double() and
snd_ac97_put_enum_double().

https://bugtrack.alsa-project.org/alsa-bug/view.php?id=1072



Signed-off-by: default avatarSergey Vlasov <vsu@altlinux.ru>
Signed-off-by: default avatarJaroslav Kysela <perex@suse.cz>
parent ee733397

sound/pci/ac97/ac97_codec.c

+2 −2
Original line number Diff line number Diff line
@@ -465,7 +465,7 @@ int snd_ac97_get_enum_double(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * u 
	struct ac97_enum *e = (struct ac97_enum *)kcontrol->private_value;

	unsigned short val, bitmask;

	

	for (bitmask = 1; bitmask > e->mask; bitmask <<= 1)

	for (bitmask = 1; bitmask < e->mask; bitmask <<= 1)

		;

	val = snd_ac97_read_cache(ac97, e->reg);

	ucontrol->value.enumerated.item[0] = (val >> e->shift_l) & (bitmask - 1);
@@ -482,7 +482,7 @@ int snd_ac97_put_enum_double(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * u 
	unsigned short val;

	unsigned short mask, bitmask;

	

	for (bitmask = 1; bitmask > e->mask; bitmask <<= 1)

	for (bitmask = 1; bitmask < e->mask; bitmask <<= 1)

		;

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

		return -EINVAL;