aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2010-07-08 10:55:02 -0400
committerTakashi Iwai <tiwai@suse.de>2010-07-08 10:55:02 -0400
commitb492c4e8954d54f806875c149bbcafaa7ede7ada (patch)
treeb088a6518ef1cf6750df1867305bbcea29e99956 /sound/pci
parent815c4163b6c8ebf8152f42b0a5fd015cfdcedc78 (diff)
parentf189efcd1cc06b75fe18642c9751d26aa5ed2b54 (diff)
Merge branch 'fix/hda' into for-linus
Diffstat (limited to 'sound/pci')
-rw-r--r--sound/pci/hda/patch_realtek.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index f1ce7d7f5aa3..ff614dd824c1 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -1268,8 +1268,10 @@ static int alc_auto_parse_customize_define(struct hda_codec *codec)
1268 struct alc_spec *spec = codec->spec; 1268 struct alc_spec *spec = codec->spec;
1269 1269
1270 ass = codec->subsystem_id & 0xffff; 1270 ass = codec->subsystem_id & 0xffff;
1271 if (ass != codec->bus->pci->subsystem_device && (ass & 1)) 1271 if (ass != codec->bus->pci->subsystem_device && (ass & 1)) {
1272 spec->cdefine.enable_pcbeep = 1; /* assume always enabled */
1272 goto do_sku; 1273 goto do_sku;
1274 }
1273 1275
1274 nid = 0x1d; 1276 nid = 0x1d;
1275 if (codec->vendor_id == 0x10ec0260) 1277 if (codec->vendor_id == 0x10ec0260)
@@ -2547,7 +2549,7 @@ static struct snd_kcontrol_new alc_beep_mixer[] = {
2547static int alc_build_controls(struct hda_codec *codec) 2549static int alc_build_controls(struct hda_codec *codec)
2548{ 2550{
2549 struct alc_spec *spec = codec->spec; 2551 struct alc_spec *spec = codec->spec;
2550 struct snd_kcontrol *kctl; 2552 struct snd_kcontrol *kctl = NULL;
2551 struct snd_kcontrol_new *knew; 2553 struct snd_kcontrol_new *knew;
2552 int i, j, err; 2554 int i, j, err;
2553 unsigned int u; 2555 unsigned int u;
@@ -9486,6 +9488,7 @@ static struct snd_pci_quirk alc882_ssid_cfg_tbl[] = {
9486 SND_PCI_QUIRK(0x106b, 0x3e00, "iMac 24 Aluminum", ALC885_IMAC24), 9488 SND_PCI_QUIRK(0x106b, 0x3e00, "iMac 24 Aluminum", ALC885_IMAC24),
9487 SND_PCI_QUIRK(0x106b, 0x4900, "iMac 9,1 Aluminum", ALC885_IMAC91), 9489 SND_PCI_QUIRK(0x106b, 0x4900, "iMac 9,1 Aluminum", ALC885_IMAC91),
9488 SND_PCI_QUIRK(0x106b, 0x3f00, "Macbook 5,1", ALC885_MB5), 9490 SND_PCI_QUIRK(0x106b, 0x3f00, "Macbook 5,1", ALC885_MB5),
9491 SND_PCI_QUIRK(0x106b, 0x4a00, "Macbook 5,2", ALC885_MB5),
9489 /* FIXME: HP jack sense seems not working for MBP 5,1 or 5,2, 9492 /* FIXME: HP jack sense seems not working for MBP 5,1 or 5,2,
9490 * so apparently no perfect solution yet 9493 * so apparently no perfect solution yet
9491 */ 9494 */