---

yaml --- r: 270391 b: refs/heads/master c: 801f49d h: refs/heads/master i: 270389: ff838f2 270387: 9228cd9 270383: 687e79c v: v3
git-mirror · Oct 17, 2011 · 9fcb80d · 9fcb80d
1 parent 3cbae57
commit 9fcb80d
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 20ca0c350d4dd901277089bfcf7ce8652addd1d0
+refs/heads/master: 801f49d3b84c18f66afb54532b54894b1b2afe2d
diff --git a/trunk/sound/pci/hda/patch_realtek.c b/trunk/sound/pci/hda/patch_realtek.c
@@ -5671,7 +5671,11 @@ static int patch_alc662(struct hda_codec *codec)
 
 static int patch_alc888(struct hda_codec *codec)
 {
-	if ((alc_read_coef_idx(codec, 0) & 0x00f0)==0x0030){
+	int coef;
+
+	coef = alc_read_coef_idx(codec, 0);
+	/* For ALC887-VD ALC888S-VD */
+	if ((coef & 0x00f0) == 0x0030) {
 		kfree(codec->chip_name);
 		if (codec->vendor_id == 0x10ec0887)
 			codec->chip_name = kstrdup("ALC887-VD", GFP_KERNEL);
@@ -5683,6 +5687,18 @@ static int patch_alc888(struct hda_codec *codec)
 		}
 		return patch_alc662(codec);
 	}
+
+	/* For ALC888S-VC */
+	if (codec->vendor_id == 0x10ec0888) {
+		if ((coef & 0xf0f0) == 0x3020) {
+			kfree(codec->chip_name);
+			codec->chip_name = kstrdup("ALC886", GFP_KERNEL);
+			if (!codec->chip_name) {
+				alc_free(codec);
+				return -ENOMEM;
+			}
+		}
+	}
 	return patch_alc882(codec);
 }