1 files changed, 8 insertions, 6 deletions

diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c
index e2f83591161b..6d1924c19abf 100644
--- a/sound/pci/hda/patch_sigmatel.c
+++ b/sound/pci/hda/patch_sigmatel.c
@@ -417,9 +417,11 @@ static void stac_update_outputs(struct hda_codec *codec)
                         val &= ~spec->eapd_mask;
                 else
                         val |= spec->eapd_mask;
-                if (spec->gpio_data != val)
+                if (spec->gpio_data != val) {
+                        spec->gpio_data = val;
                         stac_gpio_set(codec, spec->gpio_mask, spec->gpio_dir,
                                       val);
+                }
         }
 }
 
@@ -2817,6 +2819,7 @@ static const struct hda_pintbl ecs202_pin_configs[] = {
 
 /* codec SSIDs for Intel Mac sharing the same PCI SSID 8384:7680 */
 static const struct snd_pci_quirk stac922x_intel_mac_fixup_tbl[] = {
+        SND_PCI_QUIRK(0x0000, 0x0100, "Mac Mini", STAC_INTEL_MAC_V3),
         SND_PCI_QUIRK(0x106b, 0x0800, "Mac", STAC_INTEL_MAC_V1),
         SND_PCI_QUIRK(0x106b, 0x0600, "Mac", STAC_INTEL_MAC_V2),
         SND_PCI_QUIRK(0x106b, 0x0700, "Mac", STAC_INTEL_MAC_V2),
@@ -3231,7 +3234,7 @@ static const struct hda_fixup stac927x_fixups[] = {
                         /* configure the analog microphone on some laptops */
                         { 0x0c, 0x90a79130 },
                         /* correct the front output jack as a hp out */
-                        { 0x0f, 0x0227011f },
+                        { 0x0f, 0x0221101f },
                         /* correct the front input jack as a mic */
                         { 0x0e, 0x02a79130 },
                         {}
@@ -3612,20 +3615,18 @@ static int stac_parse_auto_config(struct hda_codec *codec)
 static int stac_init(struct hda_codec *codec)
 {
         struct sigmatel_spec *spec = codec->spec;
-        unsigned int gpio;
         int i;
 
         /* override some hints */
         stac_store_hints(codec);
 
         /* set up GPIO */
-        gpio = spec->gpio_data;
         /* turn on EAPD statically when spec->eapd_switch isn't set.
          * otherwise, unsol event will turn it on/off dynamically
          */
         if (!spec->eapd_switch)
-                gpio |= spec->eapd_mask;
-        stac_gpio_set(codec, spec->gpio_mask, spec->gpio_dir, gpio);
+                spec->gpio_data |= spec->eapd_mask;
+        stac_gpio_set(codec, spec->gpio_mask, spec->gpio_dir, spec->gpio_data);
 
         snd_hda_gen_init(codec);
 
@@ -3915,6 +3916,7 @@ static void stac_setup_gpio(struct hda_codec *codec)
 {
         struct sigmatel_spec *spec = codec->spec;
 
+        spec->gpio_mask |= spec->eapd_mask;
         if (spec->gpio_led) {
                 if (!spec->vref_mute_led_nid) {
                         spec->gpio_mask |= spec->gpio_led;