Merge branch 'fix/hda' into topic/hda

Conflicts:
	sound/pci/hda/patch_realtek.c

diff --cc sound/core/pcm_native.c
Simple merge

diff --cc sound/pci/ac97/ac97_patch.c
Simple merge

diff --cc sound/pci/hda/hda_codec.c
Simple merge

diff --cc sound/pci/hda/hda_codec.h
Simple merge

diff --cc sound/pci/hda/patch_analog.c
Simple merge

diff --cc sound/pci/hda/patch_realtek.c
index 141ff44,6ae610c..c53faa9
--- 1/sound/pci/hda/patch_realtek.c
--- 2/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@@ -3715,34 -3642,6 +3724,31 @@@ static void alc_free(struct hda_codec *
  }
  
  #ifdef CONFIG_SND_HDA_POWER_SAVE
-               snd_hda_codec_write(codec, 0x0f, 0,
-                                   AC_VERB_SET_EAPD_BTLENABLE, 0x00);
-               snd_hda_codec_write(codec, 0x10, 0,
-                                   AC_VERB_SET_EAPD_BTLENABLE, 0x00);
 +static void alc_power_eapd(struct hda_codec *codec)
 +{
 +      /* We currently only handle front, HP */
 +      switch (codec->vendor_id) {
 +      case 0x10ec0260:
-               snd_hda_codec_write(codec, 0x14, 0,
-                                   AC_VERB_SET_EAPD_BTLENABLE, 0x00);
-               snd_hda_codec_write(codec, 0x15, 0,
-                                   AC_VERB_SET_EAPD_BTLENABLE, 0x00);
++              set_eapd(codec, 0x0f, 0);
++              set_eapd(codec, 0x10, 0);
 +              break;
 +      case 0x10ec0262:
 +      case 0x10ec0267:
 +      case 0x10ec0268:
 +      case 0x10ec0269:
++      case 0x10ec0270:
 +      case 0x10ec0272:
 +      case 0x10ec0660:
 +      case 0x10ec0662:
 +      case 0x10ec0663:
 +      case 0x10ec0862:
 +      case 0x10ec0889:
++              set_eapd(codec, 0x14, 0);
++              set_eapd(codec, 0x15, 0);
 +              break;
 +      }
 +}
 +
  static int alc_suspend(struct hda_codec *codec, pm_message_t state)
  {
        struct alc_spec *spec = codec->spec;

diff --cc sound/pci/hda/patch_sigmatel.c
Simple merge