Commit 69a07304 authored by Clemens Ladisch's avatar Clemens Ladisch Committed by Jaroslav Kysela

[ALSA] cmipci: disable 'Modem' control on version 39 or newer chips

On version 39 or newer chips, we better remove the 'Modem' control
because this register bit now mutes the front channels of the
multichannel stream.
Signed-off-by: default avatarClemens Ladisch <clemens@ladisch.de>
Signed-off-by: default avatarJaroslav Kysela <perex@perex.cz>
parent befceea9
...@@ -2651,10 +2651,8 @@ static struct snd_kcontrol_new snd_cmipci_extra_mixer_switches[] __devinitdata = ...@@ -2651,10 +2651,8 @@ static struct snd_kcontrol_new snd_cmipci_extra_mixer_switches[] __devinitdata =
}; };
/* card control switches */ /* card control switches */
static struct snd_kcontrol_new snd_cmipci_control_switches[] __devinitdata = { static struct snd_kcontrol_new snd_cmipci_modem_switch __devinitdata =
// DEFINE_CARD_SWITCH("Joystick", joystick), /* now module option */ DEFINE_CARD_SWITCH("Modem", modem);
DEFINE_CARD_SWITCH("Modem", modem),
};
static int __devinit snd_cmipci_mixer_new(struct cmipci *cm, int pcm_spdif_device) static int __devinit snd_cmipci_mixer_new(struct cmipci *cm, int pcm_spdif_device)
...@@ -2735,9 +2733,9 @@ static int __devinit snd_cmipci_mixer_new(struct cmipci *cm, int pcm_spdif_devic ...@@ -2735,9 +2733,9 @@ static int __devinit snd_cmipci_mixer_new(struct cmipci *cm, int pcm_spdif_devic
} }
/* card switches */ /* card switches */
sw = snd_cmipci_control_switches; if (cm->chip_version < 39) {
for (idx = 0; idx < ARRAY_SIZE(snd_cmipci_control_switches); idx++, sw++) { err = snd_ctl_add(cm->card,
err = snd_ctl_add(cm->card, snd_ctl_new1(sw, cm)); snd_ctl_new1(&snd_cmipci_modem_switch, cm));
if (err < 0) if (err < 0)
return err; return err;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment