mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-04 09:59:32 +00:00
ALSA: hda - Fix panned "Beep Playback Switch"
When "Beep Playback Switch" had a different value on left and right channels (such as muting left but not right, or vice versa), this could result in the right channel being ignored. This patch enables beep to be sounding from right channel only, and also give correct result back to userspace (e g amixer). Signed-off-by: David Henningsson <david.henningsson@canonical.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
parent
de64c0ee7d
commit
14bc9c6dc6
1 changed files with 14 additions and 6 deletions
|
@ -237,10 +237,9 @@ int snd_hda_mixer_amp_switch_get_beep(struct snd_kcontrol *kcontrol,
|
|||
{
|
||||
struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
|
||||
struct hda_beep *beep = codec->beep;
|
||||
if (beep) {
|
||||
if (beep && !beep->enabled) {
|
||||
ucontrol->value.integer.value[0] =
|
||||
ucontrol->value.integer.value[1] =
|
||||
beep->enabled;
|
||||
ucontrol->value.integer.value[1] = 0;
|
||||
return 0;
|
||||
}
|
||||
return snd_hda_mixer_amp_switch_get(kcontrol, ucontrol);
|
||||
|
@ -252,9 +251,18 @@ int snd_hda_mixer_amp_switch_put_beep(struct snd_kcontrol *kcontrol,
|
|||
{
|
||||
struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
|
||||
struct hda_beep *beep = codec->beep;
|
||||
if (beep)
|
||||
snd_hda_enable_beep_device(codec,
|
||||
*ucontrol->value.integer.value);
|
||||
if (beep) {
|
||||
u8 chs = get_amp_channels(kcontrol);
|
||||
int enable = 0;
|
||||
long *valp = ucontrol->value.integer.value;
|
||||
if (chs & 1) {
|
||||
enable |= *valp;
|
||||
valp++;
|
||||
}
|
||||
if (chs & 2)
|
||||
enable |= *valp;
|
||||
snd_hda_enable_beep_device(codec, enable);
|
||||
}
|
||||
return snd_hda_mixer_amp_switch_put(kcontrol, ucontrol);
|
||||
}
|
||||
EXPORT_SYMBOL_HDA(snd_hda_mixer_amp_switch_put_beep);
|
||||
|
|
Loading…
Reference in a new issue