Merge branch 'fix/hda' into topic/hda

Conflicts:
	sound/pci/hda/patch_realtek.c

diff --cc sound/pci/hda/patch_realtek.c
index e0ecf5a5b097c8d0cdce67a4d9260ad6495739ef,7cabd731716395e7f5386425236660283f096fdf..c3e5af955620fc5a3b71fe7382c4adc04c6f3c81
--- 1/sound/pci/hda/patch_realtek.c
--- 2/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@@ -581,9 -568,9 +581,9 @@@ static void alc_hp_automute(struct hda_
        spec->jack_present =
                detect_jacks(codec, ARRAY_SIZE(spec->autocfg.hp_pins),
                             spec->autocfg.hp_pins);
 -      update_speakers(codec);
+       if (!spec->automute)
+               return;
 +      call_update_speakers(codec);
  }
  
  /* standard line-out-automute helper */
@@@ -594,9 -581,9 +594,9 @@@ static void alc_line_automute(struct hd
        spec->line_jack_present =
                detect_jacks(codec, ARRAY_SIZE(spec->autocfg.line_out_pins),
                             spec->autocfg.line_out_pins);
 -      update_speakers(codec);
+       if (!spec->automute || !spec->detect_line)
+               return;
 +      call_update_speakers(codec);
  }
  
  #define get_connection_index(codec, mux, nid) \