[PATCH] [UBUNTU:sound/pci/] #41015: Fix Master volume control for headphones (hp_only quirk) for HP NX8220 (intel8x0)

[crimsun at fungus.sh.nu]

Subject: [PATCH] [UBUNTU:sound/pci/] #41015: Fix Master volume control for headphones (hp_only quirk) for HP NX8220 (intel8x0)

UpstreamStatus: Not merged

Adolfo González Blázquez reports in Malone #41015 that volume control
under current Dapper for his HP NX8220 laptop fails to function
consistently with Breezy, namely the Master volume control should but
does not control the headphone jack. This patch fixes the regression
from Breezy and also removes a duplicate {subvendor,subdevice} entry in
the quirks list (the HP NC8220 and HP NX8220 have identical IDs).

This commit closes Malone #41015.

Signed-off-by: Daniel T Chen <crimsun at ubuntu.com>

---

 sound/pci/intel8x0.c |   10 ++--------
 1 files changed, 2 insertions(+), 8 deletions(-)

23c077a415f8ca082859984ec34d105b39f7a551
diff --git a/sound/pci/intel8x0.c b/sound/pci/intel8x0.c
index 47e80d8..6179f88 100644
--- a/sound/pci/intel8x0.c
+++ b/sound/pci/intel8x0.c
@@ -1794,12 +1794,6 @@ static struct ac97_quirk ac97_quirks[] _
 	},
 	{
 		.subvendor = 0x103c,
-		.subdevice = 0x0934,
-		.name = "HP nx8220",
-		.type = AC97_TUNE_MUTE_LED
-	},
-	{
-		.subvendor = 0x103c,
 		.subdevice = 0x099c,
 		.name = "HP nx6110",	/* AD1981B */
 		.type = AC97_TUNE_HP_ONLY
@@ -1828,11 +1822,11 @@ static struct ac97_quirk ac97_quirks[] _
 		.name = "HP nc6220",
 		.type = AC97_TUNE_HP_MUTE_LED
 	},
-	{
+	{ /* removed duplicate subvendor,subdevice entry for HP nx8220 */
 		.subvendor = 0x103c,
 		.subdevice = 0x0934,
 		.name = "HP nc8220",
-		.type = AC97_TUNE_HP_MUTE_LED
+		.type = AC97_TUNE_HP_ONLY /* changed from AC97_TUNE_HP_MUTE_LED, see Malone #41015 */
 	},
 	{
 		.subvendor = 0x103c,
-- 
1.1.3

-- 
Daniel T. Chen            crimsun at ubuntu.com
GPG key:   www.sh.nu/~crimsun/pubkey.gpg.asc
-------------- 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/20060425/78c8945a/attachment.sig>