Commit d82ed2ff authored Jan 04, 2006 by Ulrich Mueller Committed by Jaroslav Kysela Jan 22, 2006

[ALSA] intel8x0 - Fix duplicate ac97_quirks entry



Modules: Intel8x0 driver

in recent -mm kernels additional quirks for ac97 hardware in HP laptops
have been added.  However, now the list in intel8x0.c contains a duplicate,
since the HP nx6110 and nc6120 have identical subdevice ids.

This was introduced in -mm1 by the following patch:
add-new-quirk-for-devices-with-mute-leds-and-separate-headphone-volume.patch

Since the HP nx6110 and nc6120 are almost identical, both entries
should really be combined, as in the following patch. I have checked
that AC97_TUNE_HP_MUTE_LED is the right thing to do.

Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

parent 6c1080c1

sound/pci/intel8x0.c

+1 −7

Original line number	Diff line number	Diff line
		@@ -1845,12 +1845,6 @@ static struct ac97_quirk ac97_quirks[] __devinitdata = {
		.name = "HP nx8220",
		.type = AC97_TUNE_MUTE_LED
		},
		{
		.subvendor = 0x103c,
		.subdevice = 0x099c,
		.name = "HP nx6110", /* AD1981B */
		.type = AC97_TUNE_HP_ONLY
		},
		{
		.subvendor = 0x103c,
		.subdevice = 0x129d,
		@@ -1866,7 +1860,7 @@ static struct ac97_quirk ac97_quirks[] __devinitdata = {
		{
		.subvendor = 0x103c,
		.subdevice = 0x099c,
		.name = "HP nc6120",
		.name = "HP nx6110/nc6120",
		.type = AC97_TUNE_HP_MUTE_LED
		},
		{

Admin message