Merge branch 'fix/hda' into topic/hda

diff --cc sound/pci/hda/patch_realtek.c
index 98cc465992f25094ed3c30756a997f9d87bfdd7c,4b35176d34548eaa1a4064619360fa58c25e7523..ba95039e8ca39a80e2b04a61cf65d32825986339
--- 1/sound/pci/hda/patch_realtek.c
--- 2/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;