diff options
| author | Takashi Iwai <tiwai@suse.de> | 2012-02-13 12:05:30 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2012-02-13 12:05:30 +0100 |
| commit | 374a69e76effdb84ef068d63759d8f990710432f (patch) | |
| tree | 3dc7c85a7c80e763b4cc45e067ef50f2cff9c76a /sound/pci/hda/patch_realtek.c | |
| parent | 8bc039a1e15a72da8426b84293723fb7181f0b5e (diff) | |
| parent | a1e0c3cf7fb07227fe1f26161d969101dba78287 (diff) | |
Merge branch 'fix/hda' into topic/hda
Necessary for working on the jack-detection suppression feature.
Diffstat (limited to 'sound/pci/hda/patch_realtek.c')
| -rw-r--r-- | sound/pci/hda/patch_realtek.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index 42f18449b82..4a2a49fd92a 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -2298,7 +2298,7 @@ static int alc_build_pcms(struct hda_codec *codec) "%s Analog", codec->chip_name); info->name = spec->stream_name_analog; - if (spec->multiout.dac_nids > 0) { + if (spec->multiout.num_dacs > 0) { p = spec->stream_analog_playback; if (!p) p = &alc_pcm_analog_playback; @@ -5603,6 +5603,7 @@ static const struct alc_fixup alc861_fixups[] = { static const struct snd_pci_quirk alc861_fixup_tbl[] = { SND_PCI_QUIRK_VENDOR(0x1043, "ASUS laptop", PINFIX_ASUS_A6RP), + SND_PCI_QUIRK(0x1584, 0x0000, "Uniwill ECS M31EI", PINFIX_ASUS_A6RP), SND_PCI_QUIRK(0x1584, 0x2b01, "Haier W18", PINFIX_ASUS_A6RP), SND_PCI_QUIRK(0x1734, 0x10c7, "FSC Amilo Pi1505", PINFIX_FSC_AMILO_PI1505), {} |