diff options
| author | Clemens Ladisch <clemens@ladisch.de> | 2007-12-10 12:28:52 +0100 |
|---|---|---|
| committer | Jaroslav Kysela <perex@perex.cz> | 2008-01-31 17:29:31 +0100 |
| commit | 69a07304d52cc1080fa650c4ba7a82eed3cd143c (patch) | |
| tree | 515c3bff56dea107cd6d0485a2812fb9286fbb00 /sound | |
| parent | befceea90b17792cb03cc4e22f3329c89621bba3 (diff) | |
| download | linux-69a07304d52cc1080fa650c4ba7a82eed3cd143c.tar.gz linux-69a07304d52cc1080fa650c4ba7a82eed3cd143c.tar.bz2 linux-69a07304d52cc1080fa650c4ba7a82eed3cd143c.zip | |
[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: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/pci/cmipci.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/sound/pci/cmipci.c b/sound/pci/cmipci.c index 187203e55d39..8cb3436d0d9c 100644 --- a/sound/pci/cmipci.c +++ b/sound/pci/cmipci.c @@ -2651,10 +2651,8 @@ static struct snd_kcontrol_new snd_cmipci_extra_mixer_switches[] __devinitdata = }; /* card control switches */ -static struct snd_kcontrol_new snd_cmipci_control_switches[] __devinitdata = { - // DEFINE_CARD_SWITCH("Joystick", joystick), /* now module option */ - DEFINE_CARD_SWITCH("Modem", modem), -}; +static struct snd_kcontrol_new snd_cmipci_modem_switch __devinitdata = +DEFINE_CARD_SWITCH("Modem", modem); 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 } /* card switches */ - sw = snd_cmipci_control_switches; - for (idx = 0; idx < ARRAY_SIZE(snd_cmipci_control_switches); idx++, sw++) { - err = snd_ctl_add(cm->card, snd_ctl_new1(sw, cm)); + if (cm->chip_version < 39) { + err = snd_ctl_add(cm->card, + snd_ctl_new1(&snd_cmipci_modem_switch, cm)); if (err < 0) return err; } |