summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Ranostay <mranostay@embeddedalley.com>2007-09-18 00:52:38 +0200
committerJaroslav Kysela <perex@perex.cz>2007-10-16 16:50:53 +0200
commitb44ef2f1544a0a8d3d8907890662924082d0f1fa (patch)
tree3a0de88b04b1722936c47d6d12891d960f526873
parent3723e2d25151f919e55da98f89a2787802ad5494 (diff)
downloadlinux-3.10-b44ef2f1544a0a8d3d8907890662924082d0f1fa.tar.gz
linux-3.10-b44ef2f1544a0a8d3d8907890662924082d0f1fa.tar.bz2
linux-3.10-b44ef2f1544a0a8d3d8907890662924082d0f1fa.zip
[ALSA] hda: More subsystem id BIOS changes
More laptop BIOS changes the subsystem id for STAC9205 cards if the microphone is toggled on/off in the settings. The patch removes the old STAC_9205_M43xx and use STAC_9205_DELL_M43. Signed-off-by: Matthew Ranostay <mranostay@embeddedalley.com> Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Jaroslav Kysela <perex@suse.cz>
-rw-r--r--sound/pci/hda/patch_sigmatel.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c
index 2feb0f2e38c..27360d278bc 100644
--- a/sound/pci/hda/patch_sigmatel.c
+++ b/sound/pci/hda/patch_sigmatel.c
@@ -57,7 +57,6 @@ enum {
STAC_9205_DELL_M42,
STAC_9205_DELL_M43,
STAC_9205_DELL_M44,
- STAC_9205_M43xx,
STAC_9205_MODELS
};
@@ -1163,7 +1162,6 @@ static unsigned int *stac9205_brd_tbl[STAC_9205_MODELS] = {
[STAC_9205_DELL_M42] = dell_9205_m42_pin_configs,
[STAC_9205_DELL_M43] = dell_9205_m43_pin_configs,
[STAC_9205_DELL_M44] = dell_9205_m44_pin_configs,
- [STAC_9205_M43xx] = NULL,
};
static const char *stac9205_models[STAC_9205_MODELS] = {
@@ -1182,7 +1180,9 @@ static struct snd_pci_quirk stac9205_cfg_tbl[] = {
SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01f2,
"unknown Dell", STAC_9205_DELL_M42),
SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01f8,
- "Dell Precision", STAC_9205_M43xx),
+ "Dell Precision", STAC_9205_DELL_M43),
+ SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x021c,
+ "Dell Precision", STAC_9205_DELL_M43),
SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01f9,
"Dell Precision", STAC_9205_DELL_M43),
SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x021b,
@@ -2807,7 +2807,6 @@ static int patch_stac9205(struct hda_codec *codec)
spec->multiout.dac_nids = spec->dac_nids;
switch (spec->board_config){
- case STAC_9205_M43xx:
case STAC_9205_DELL_M43:
/* Enable SPDIF in/out */
stac92xx_set_config_reg(codec, 0x1f, 0x01441030);