aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci
diff options
context:
space:
mode:
authorKailang Yang <kailang@realtek.com>2010-11-22 04:59:36 -0500
committerTakashi Iwai <tiwai@suse.de>2010-11-22 04:59:36 -0500
commit01e0f1378c47947b825eac05c98697ab1be1c86f (patch)
treee96a19b8071ba4065f33237fb6d04489aaa69dcc /sound/pci
parent1beded5d9ce90256e4a7e7b0e96c317eafe1c513 (diff)
ALSA: hda - Fixed ALC887-VD initial error
ALC887-VD is like ALC888-VD. It can not be initialized as ALC882. Signed-off-by: Kailang Yang <kailang@realtek.com> Cc: <stable@kernel.org> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci')
-rw-r--r--sound/pci/hda/patch_realtek.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index 1a7703a49655..564e6c136ddd 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -19420,7 +19420,10 @@ static int patch_alc888(struct hda_codec *codec)
19420{ 19420{
19421 if ((alc_read_coef_idx(codec, 0) & 0x00f0)==0x0030){ 19421 if ((alc_read_coef_idx(codec, 0) & 0x00f0)==0x0030){
19422 kfree(codec->chip_name); 19422 kfree(codec->chip_name);
19423 codec->chip_name = kstrdup("ALC888-VD", GFP_KERNEL); 19423 if (codec->vendor_id == 0x10ec0887)
19424 codec->chip_name = kstrdup("ALC887-VD", GFP_KERNEL);
19425 else
19426 codec->chip_name = kstrdup("ALC888-VD", GFP_KERNEL);
19424 if (!codec->chip_name) { 19427 if (!codec->chip_name) {
19425 alc_free(codec); 19428 alc_free(codec);
19426 return -ENOMEM; 19429 return -ENOMEM;
@@ -19910,7 +19913,7 @@ static struct hda_codec_preset snd_hda_preset_realtek[] = {
19910 { .id = 0x10ec0885, .rev = 0x100103, .name = "ALC889A", 19913 { .id = 0x10ec0885, .rev = 0x100103, .name = "ALC889A",
19911 .patch = patch_alc882 }, 19914 .patch = patch_alc882 },
19912 { .id = 0x10ec0885, .name = "ALC885", .patch = patch_alc882 }, 19915 { .id = 0x10ec0885, .name = "ALC885", .patch = patch_alc882 },
19913 { .id = 0x10ec0887, .name = "ALC887", .patch = patch_alc882 }, 19916 { .id = 0x10ec0887, .name = "ALC887", .patch = patch_alc888 },
19914 { .id = 0x10ec0888, .rev = 0x100101, .name = "ALC1200", 19917 { .id = 0x10ec0888, .rev = 0x100101, .name = "ALC1200",
19915 .patch = patch_alc882 }, 19918 .patch = patch_alc882 },
19916 { .id = 0x10ec0888, .name = "ALC888", .patch = patch_alc888 }, 19919 { .id = 0x10ec0888, .name = "ALC888", .patch = patch_alc888 },