3 files changed, 13 insertions, 5 deletions

diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
index be6982289c0d..e9a2a8795d1b 100644
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@ -1924,7 +1924,8 @@ static unsigned int azx_via_get_position(struct azx *chip,
 }
 
 static unsigned int azx_get_position(struct azx *chip,
-                                     struct azx_dev *azx_dev)
+                                     struct azx_dev *azx_dev,
+                                     bool with_check)
 {
         unsigned int pos;
         int stream = azx_dev->substream->stream;
@@ -1940,7 +1941,7 @@ static unsigned int azx_get_position(struct azx *chip,
         default:
                 /* use the position buffer */
                 pos = le32_to_cpu(*azx_dev->posbuf);
-                if (chip->position_fix[stream] == POS_FIX_AUTO) {
+                if (with_check && chip->position_fix[stream] == POS_FIX_AUTO) {
                         if (!pos || pos == (u32)-1) {
                                 printk(KERN_WARNING
                                        "hda-intel: Invalid position buffer, "
@@ -1964,7 +1965,7 @@ static snd_pcm_uframes_t azx_pcm_pointer(struct snd_pcm_substream *substream)
         struct azx *chip = apcm->chip;
         struct azx_dev *azx_dev = get_azx_dev(substream);
         return bytes_to_frames(substream->runtime,
-                               azx_get_position(chip, azx_dev));
+                               azx_get_position(chip, azx_dev, false));
 }
 
 /*
@@ -1987,7 +1988,7 @@ static int azx_position_ok(struct azx *chip, struct azx_dev *azx_dev)
                 return -1;      /* bogus (too early) interrupt */
 
         stream = azx_dev->substream->stream;
-        pos = azx_get_position(chip, azx_dev);
+        pos = azx_get_position(chip, azx_dev, true);
 
         if (WARN_ONCE(!azx_dev->period_bytes,
                       "hda-intel: zero azx_dev->period_bytes"))
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index 0503c999e7d3..7a73621a8909 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -578,6 +578,10 @@ static void alc_line_automute(struct hda_codec *codec)
 {
         struct alc_spec *spec = codec->spec;
 
+        /* check LO jack only when it's different from HP */
+        if (spec->autocfg.line_out_pins[0] == spec->autocfg.hp_pins[0])
+                return;
+
         spec->line_jack_present =
                 detect_jacks(codec, ARRAY_SIZE(spec->autocfg.line_out_pins),
                              spec->autocfg.line_out_pins);
@@ -1321,7 +1325,9 @@ do_sku:
          * 15   : 1 --> enable the function "Mute internal speaker
          *              when the external headphone out jack is plugged"
          */
-        if (!spec->autocfg.hp_pins[0]) {
+        if (!spec->autocfg.hp_pins[0] &&
+            !(spec->autocfg.line_out_pins[0] &&
+              spec->autocfg.line_out_type == AUTO_PIN_HP_OUT)) {
                 hda_nid_t nid;
                 tmp = (ass >> 11) & 0x3;        /* HP to chassis */
                 if (tmp == 0)
diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c
index 1b7c11432aa7..987e3cf71a0b 100644
--- a/sound/pci/hda/patch_sigmatel.c
+++ b/sound/pci/hda/patch_sigmatel.c
@@ -5630,6 +5630,7 @@ again:
         switch (codec->vendor_id) {
         case 0x111d76d1:
         case 0x111d76d9:
+        case 0x111d76df:
         case 0x111d76e5:
         case 0x111d7666:
         case 0x111d7667: