From: Takashi Iwai <tiwai@suse.de>
Date: Tue, 13 Apr 2010 07:44:26 +0000 (+0200)
Subject: Merge branch 'fix/hda' into for-next
X-Git-Tag: next-20110726~34^2~701
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=6b8d7c597926657ee40498fdc1973f82963b5044;p=karo-tx-linux.git

Merge branch 'fix/hda' into for-next
---

6b8d7c597926657ee40498fdc1973f82963b5044
diff --cc sound/pci/hda/patch_realtek.c
index 98cc465992f2,4b35176d3454..ba95039e8ca3
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@@ -10606,10 -10520,11 +10616,13 @@@ static int patch_alc882(struct hda_code
  	}
  
  	set_capture_mixer(codec);
 -	set_beep_amp(spec, 0x0b, 0x05, HDA_INPUT);
 +
 +	if (spec->cdefine.enable_pcbeep)
 +		set_beep_amp(spec, 0x0b, 0x05, HDA_INPUT);
  
+ 	if (board_config == ALC882_AUTO)
+ 		alc_pick_fixup(codec, alc882_fixup_tbl, alc882_fixups, 0);
+ 
  	spec->vmaster_nid = 0x0c;
  
  	codec->patch_ops = alc_patch_ops;
@@@ -14455,9 -14364,11 +14492,12 @@@ static int patch_alc269(struct hda_code
  
  	if (!spec->cap_mixer)
  		set_capture_mixer(codec);
 -	set_beep_amp(spec, 0x0b, 0x04, HDA_INPUT);
 +	if (spec->cdefine.enable_pcbeep)
 +		set_beep_amp(spec, 0x0b, 0x04, HDA_INPUT);
  
+ 	if (board_config == ALC269_AUTO)
+ 		alc_pick_fixup(codec, alc269_fixup_tbl, alc269_fixups, 0);
+ 
  	spec->vmaster_nid = 0x02;
  
  	codec->patch_ops = alc_patch_ops;