summaryrefslogtreecommitdiffstats
path: root/sound/pci/hda
diff options
context:
space:
mode:
authorKailang Yang <kailang@realtek.com>2011-10-17 16:02:42 +0200
committerTakashi Iwai <tiwai@suse.de>2011-10-17 23:39:12 +0200
commit801f49d3b84c18f66afb54532b54894b1b2afe2d (patch)
tree7d3735dda3391810d51fafb2f378db252dc3cf5f /sound/pci/hda
parent20ca0c350d4dd901277089bfcf7ce8652addd1d0 (diff)
downloadop-kernel-dev-801f49d3b84c18f66afb54532b54894b1b2afe2d.zip
op-kernel-dev-801f49d3b84c18f66afb54532b54894b1b2afe2d.tar.gz
ALSA: hda - ALC888S-VC remark to ALC886
Signed-off-by: Kailang Yang <kailang@realtek.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/hda')
-rw-r--r--sound/pci/hda/patch_realtek.c18
1 files changed, 17 insertions, 1 deletions
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index b4938cc..e78f36a 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/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);
}
OpenPOWER on IntegriCloud