[PATCH] [UBUNTU:sound/pci/ac97/] Don't enumerate {HP, Line} Jack Sense elements for two models

[crimsun at fungus.sh.nu]

From c9a8ce4ee9926e1a773151e22a2a08fec56071c5 Mon Sep 17 00:00:00 2001
From: Daniel T. Chen <crimsun at garnish.localdomain>
Date: Fri, 3 Nov 2006 14:17:15 -0500
Subject: [PATCH] [UBUNTU:sound/pci/ac97/] Don't enumerate {HP,Line} Jack Sense elements for two models

UpstreamStatus: Not yet merged

In #kubuntu-devel, jeroenvr at k-uptown.xs4all.nl reports that two models
require both HP Jack Sense and Line Jack Sense elements to be muted
to gain audible sound. This patch prevents them from being enumerated.

This patch is applicable to Dapper, Edgy, and Feisty linux-source.

Signed-off-by: Daniel T Chen <crimsun at ubuntu.com>
---
 sound/pci/ac97/ac97_patch.c |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/sound/pci/ac97/ac97_patch.c b/sound/pci/ac97/ac97_patch.c
index 23674b6..0d99af7 100644
--- a/sound/pci/ac97/ac97_patch.c
+++ b/sound/pci/ac97/ac97_patch.c
@@ -1627,6 +1627,12 @@ static const snd_kcontrol_new_t snd_ac97
 	AC97_SINGLE("Line Jack Sense", AC97_AD_JACK_SPDIF, 12, 1, 0),
 };
 
+static unsigned int ad1980_jacks_blacklist[] = {
+	0x104380a1, /* irc:jeroenvr at k-uptown.xs4all.nl */
+	0x104380b0, /* irc:jeroenvr at k-uptown.xs4all.nl */
+	0 /* end */
+};
+
 /* black list to avoid HP/Line jack-sense controls
  * (SS vendor << 16 | device)
  */
@@ -1885,6 +1891,8 @@ static int patch_ad1980_specific(ac97_t 
 
 	if ((err = patch_ad1888_specific(ac97)) < 0)
 		return err;
+	if (check_list(ac97, ad1980_jacks_blacklist))
+		return 0;
 	return patch_build_controls(ac97, &snd_ac97_ad198x_2cmic, 1);
 }
 
-- 
1.4.1

-- 
Daniel T. Chen            crimsun at ubuntu.com
GPG key:  0xC88ABDA3
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
URL: <https://lists.ubuntu.com/archives/kernel-team/attachments/20061103/0b3f7d60/attachment.sig>