From 026838dc30858e7ed7237bcceaa56fb37bf8201f Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Tue, 2 May 2006 18:22:06 +0200 Subject: [PATCH] --- yaml --- r: 28490 b: refs/heads/master c: eed656493a459bbc0fdf687fa8f43f87946d8d3a h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/sound/pci/ac97/ac97_patch.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 2e07b5648f54..ce336458c7f7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 886da8677d2e4e942fc8984b22bfb8da45e810ec +refs/heads/master: eed656493a459bbc0fdf687fa8f43f87946d8d3a diff --git a/trunk/sound/pci/ac97/ac97_patch.c b/trunk/sound/pci/ac97/ac97_patch.c index 4d9cf37300f7..720b419e0c63 100644 --- a/trunk/sound/pci/ac97/ac97_patch.c +++ b/trunk/sound/pci/ac97/ac97_patch.c @@ -2048,7 +2048,10 @@ int patch_alc650(struct snd_ac97 * ac97) /* Enable SPDIF-IN only on Rev.E and above */ val = snd_ac97_read(ac97, AC97_ALC650_CLOCK); /* SPDIF IN with pin 47 */ - if (ac97->spec.dev_flags) + if (ac97->spec.dev_flags && + /* ASUS A6KM requires EAPD */ + ! (ac97->subsystem_vendor == 0x1043 && + ac97->subsystem_device == 0x1103)) val |= 0x03; /* enable */ else val &= ~0x03; /* disable */