Merge branch 'fix/hda' into topic/hda

diff --combined sound/pci/hda/patch_conexant.c
index 217ca9e13425137fc7b35f1de705e5d896a50b6f,694b9daf691f74208b88a069623586af1ef92c0b..6e864276b74492e94fa54c7236d0659aa4fa4c44
--- 1/sound/pci/hda/patch_conexant.c
--- 2/sound/pci/hda/patch_conexant.c
+++ b/sound/pci/hda/patch_conexant.c
@@@ -510,7 -510,6 +510,7 @@@ static int conexant_build_controls(stru
        }
        if (spec->multiout.dig_out_nid) {
                err = snd_hda_create_spdif_out_ctls(codec,
 +                                                  spec->multiout.dig_out_nid,
                                                    spec->multiout.dig_out_nid);
                if (err < 0)
                        return err;
@@@ -3103,6 -3102,7 +3103,7 @@@ static const struct snd_pci_quirk cxt50
        SND_PCI_QUIRK(0x17aa, 0x38af, "Lenovo G560", CXT5066_ASUS),
        SND_PCI_QUIRK(0x17aa, 0x3938, "Lenovo G565", CXT5066_AUTO),
        SND_PCI_QUIRK_VENDOR(0x17aa, "Lenovo", CXT5066_IDEAPAD), /* Fallback for Lenovos without dock mic */
+       SND_PCI_QUIRK(0x1b0a, 0x2092, "CyberpowerPC Gamer Xplorer N57001", CXT5066_AUTO),
        {}
  };
  

diff --combined sound/pci/hda/patch_realtek.c
index 5c8a4ea75cd7476dd033b0e7880f2ee3df5e19c9,61a774b3d3cb5e5ad14846815cb58304335835ba..9b97af92e3d60e95ee6621487b3ddbee0fbaeca2
--- 1/sound/pci/hda/patch_realtek.c
--- 2/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@@ -1141,6 -1141,13 +1141,13 @@@ static void update_speakers(struct hda_
        struct alc_spec *spec = codec->spec;
        int on;
  
+       /* Control HP pins/amps depending on master_mute state;
+        * in general, HP pins/amps control should be enabled in all cases,
+        * but currently set only for master_mute, just to be safe
+        */
+       do_automute(codec, ARRAY_SIZE(spec->autocfg.hp_pins),
+                   spec->autocfg.hp_pins, spec->master_mute, true);
+ 
        if (!spec->automute)
                on = 0;
        else
@@@ -3217,7 -3224,6 +3224,7 @@@ static int alc_build_controls(struct hd
        }
        if (spec->multiout.dig_out_nid) {
                err = snd_hda_create_spdif_out_ctls(codec,
 +                                                  spec->multiout.dig_out_nid,
                                                    spec->multiout.dig_out_nid);
                if (err < 0)
                        return err;
@@@ -6202,11 -6208,6 +6209,6 @@@ static const struct snd_kcontrol_new al
  /* update HP, line and mono out pins according to the master switch */
  static void alc260_hp_master_update(struct hda_codec *codec)
  {
-       struct alc_spec *spec = codec->spec;
- 
-       /* change HP pins */
-       do_automute(codec, ARRAY_SIZE(spec->autocfg.hp_pins),
-                   spec->autocfg.hp_pins, spec->master_mute, true);
        update_speakers(codec);
  }
  
@@@ -11925,7 -11926,7 +11927,7 @@@ static const struct hda_verb alc262_nec
   *  0x1b = port replicator headphone out
   */
  
- #define ALC_HP_EVENT  0x37
+ #define ALC_HP_EVENT  ALC880_HP_EVENT
  
  static const struct hda_verb alc262_fujitsu_unsol_verbs[] = {
        {0x14, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | ALC_HP_EVENT},
@@@ -13315,9 -13316,8 +13317,8 @@@ static void alc268_acer_lc_setup(struc
        struct alc_spec *spec = codec->spec;
        spec->autocfg.hp_pins[0] = 0x15;
        spec->autocfg.speaker_pins[0] = 0x14;
-       spec->automute_mixer_nid[0] = 0x0f;
        spec->automute = 1;
-       spec->automute_mode = ALC_AUTOMUTE_MIXER;
+       spec->automute_mode = ALC_AUTOMUTE_AMP;
        spec->ext_mic.pin = 0x18;
        spec->ext_mic.mux_idx = 0;
        spec->int_mic.pin = 0x12;
@@@ -13861,6 -13861,7 +13862,7 @@@ static const struct snd_pci_quirk alc26
        SND_PCI_QUIRK(0x1025, 0x015b, "Acer Aspire One",
                                                ALC268_ACER_ASPIRE_ONE),
        SND_PCI_QUIRK(0x1028, 0x0253, "Dell OEM", ALC268_DELL),
+       SND_PCI_QUIRK(0x1028, 0x02b0, "Dell Inspiron 910", ALC268_AUTO),
        SND_PCI_QUIRK_MASK(0x1028, 0xfff0, 0x02b0,
                        "Dell Inspiron Mini9/Vostro A90", ALC268_DELL),
        /* almost compatible with toshiba but with optional digital outs;