[alsa-devel] [PATCH] hda - fix name for ALC1200

[Wu Fengguang]

On Thu, Dec 25, 2008 at 03:13:58PM +0200, Thomas Schneider wrote:
> Hi,
> 
> here is the output from alsa-info.sh
> 
> http://www.alsa-project.org/db/?f=8282910dc807e1f141896886cd5f8fd574117000
> 
> I found another small mistake. In the Mixer my Soundcard is shown as "Realtek ALC888".
> When i switch this to lines in patch_realtek.c then it is shown as "Realtek ALC1200".
> 
> 
> static struct hda_codec_preset snd_hda_preset_realtek[] = {
> ......
> 
>     { .id = 0x10ec0888, .name = "ALC888", .patch = patch_alc883 },
>     { .id = 0x10ec0888, .rev = 0x100101, .name = "ALC1200",
>       .patch = patch_alc883 },
> 
> .....

Good catch!

Reversing the order should fix the name.

Thanks,
Fengguang
---
hda - fix name for ALC1200

Move the more specific preset for ALC1200 above the general one for
ALC888, so that it will have the chance to get matched and selected.

Reported-by: Thomas Schneider <nailstudio at gmx.net>
Signed-off-by: Wu Fengguang <fengguang.wu at intel.com>
---
 sound/pci/hda/patch_realtek.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- sound-2.6.orig/sound/pci/hda/patch_realtek.c
+++ sound-2.6/sound/pci/hda/patch_realtek.c
@@ -16638,9 +16638,9 @@ static struct hda_codec_preset snd_hda_p
 	  .patch = patch_alc882 }, /* should be patch_alc883() in future */
 	{ .id = 0x10ec0885, .name = "ALC885", .patch = patch_alc882 },
 	{ .id = 0x10ec0887, .name = "ALC887", .patch = patch_alc883 },
-	{ .id = 0x10ec0888, .name = "ALC888", .patch = patch_alc883 },
 	{ .id = 0x10ec0888, .rev = 0x100101, .name = "ALC1200",
 	  .patch = patch_alc883 },
+	{ .id = 0x10ec0888, .name = "ALC888", .patch = patch_alc883 },
 	{ .id = 0x10ec0889, .name = "ALC889", .patch = patch_alc883 },
 	{} /* terminator */
 };