9 files changed, 128 insertions, 66 deletions

diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c
index b7bba7dc7cf..d03f99298be 100644
--- a/sound/pci/hda/hda_codec.c
+++ b/sound/pci/hda/hda_codec.c
@@ -487,7 +487,6 @@ int /*__devinit*/ snd_hda_bus_new(struct snd_card *card,
 {
         struct hda_bus *bus;
         int err;
-        char qname[8];
         static struct snd_device_ops dev_ops = {
                 .dev_register = snd_hda_bus_dev_register,
                 .dev_free = snd_hda_bus_dev_free,
@@ -517,10 +516,12 @@ int /*__devinit*/ snd_hda_bus_new(struct snd_card *card,
         mutex_init(&bus->cmd_mutex);
         INIT_LIST_HEAD(&bus->codec_list);
 
-        snprintf(qname, sizeof(qname), "hda%d", card->number);
-        bus->workq = create_workqueue(qname);
+        snprintf(bus->workq_name, sizeof(bus->workq_name),
+                 "hd-audio%d", card->number);
+        bus->workq = create_singlethread_workqueue(bus->workq_name);
         if (!bus->workq) {
-                snd_printk(KERN_ERR "cannot create workqueue %s\n", qname);
+                snd_printk(KERN_ERR "cannot create workqueue %s\n",
+                           bus->workq_name);
                 kfree(bus);
                 return -ENOMEM;
         }
@@ -3087,6 +3088,16 @@ int snd_hda_multi_out_dig_prepare(struct hda_codec *codec,
 }
 EXPORT_SYMBOL_HDA(snd_hda_multi_out_dig_prepare);
 
+int snd_hda_multi_out_dig_cleanup(struct hda_codec *codec,
+                                  struct hda_multi_out *mout)
+{
+        mutex_lock(&codec->spdif_mutex);
+        cleanup_dig_out_stream(codec, mout->dig_out_nid);
+        mutex_unlock(&codec->spdif_mutex);
+        return 0;
+}
+EXPORT_SYMBOL_HDA(snd_hda_multi_out_dig_cleanup);
+
 /*
  * release the digital out
  */
diff --git a/sound/pci/hda/hda_codec.h b/sound/pci/hda/hda_codec.h
index 5810ef58840..09a332ada0c 100644
--- a/sound/pci/hda/hda_codec.h
+++ b/sound/pci/hda/hda_codec.h
@@ -614,6 +614,7 @@ struct hda_bus {
 
         /* unsolicited event queue */
         struct hda_bus_unsolicited *unsol;
+        char workq_name[16];
         struct workqueue_struct *workq; /* common workqueue for codecs */
 
         /* assigned PCMs */
diff --git a/sound/pci/hda/hda_hwdep.c b/sound/pci/hda/hda_hwdep.c
index 300ab407cf4..4ae51dcb81a 100644
--- a/sound/pci/hda/hda_hwdep.c
+++ b/sound/pci/hda/hda_hwdep.c
@@ -175,7 +175,7 @@ static int reconfig_codec(struct hda_codec *codec)
         err = snd_hda_codec_build_controls(codec);
         if (err < 0)
                 return err;
-        return 0;
+        return snd_card_register(codec->bus->card);
 }
 
 /*
@@ -277,18 +277,19 @@ static ssize_t init_verbs_store(struct device *dev,
 {
         struct snd_hwdep *hwdep = dev_get_drvdata(dev);
         struct hda_codec *codec = hwdep->private_data;
-        char *p;
-        struct hda_verb verb, *v;
+        struct hda_verb *v;
+        int nid, verb, param;
 
-        verb.nid = simple_strtoul(buf, &p, 0);
-        verb.verb = simple_strtoul(p, &p, 0);
-        verb.param = simple_strtoul(p, &p, 0);
-        if (!verb.nid || !verb.verb || !verb.param)
+        if (sscanf(buf, "%i %i %i", &nid, &verb, &param) != 3)
+                return -EINVAL;
+        if (!nid || !verb)
                 return -EINVAL;
         v = snd_array_new(&codec->init_verbs);
         if (!v)
                 return -ENOMEM;
-        *v = verb;
+        v->nid = nid;
+        v->verb = verb;
+        v->param = param;
         return count;
 }
 
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
index 11e791b965f..f3b5723c285 100644
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@ -1947,16 +1947,13 @@ static int azx_suspend(struct pci_dev *pci, pm_message_t state)
         return 0;
 }
 
-static int azx_resume_early(struct pci_dev *pci)
-{
-        return pci_restore_state(pci);
-}
-
 static int azx_resume(struct pci_dev *pci)
 {
         struct snd_card *card = pci_get_drvdata(pci);
         struct azx *chip = card->private_data;
 
+        pci_set_power_state(pci, PCI_D0);
+        pci_restore_state(pci);
         if (pci_enable_device(pci) < 0) {
                 printk(KERN_ERR "hda-intel: pci_enable_device failed, "
                        "disabling device\n");
@@ -2062,26 +2059,31 @@ static int __devinit check_position_fix(struct azx *chip, int fix)
 {
         const struct snd_pci_quirk *q;
 
-        /* Check VIA HD Audio Controller exist */
-        if (chip->pci->vendor == PCI_VENDOR_ID_VIA &&
-            chip->pci->device == VIA_HDAC_DEVICE_ID) {
+        switch (fix) {
+        case POS_FIX_LPIB:
+        case POS_FIX_POSBUF:
+                return fix;
+        }
+
+        /* Check VIA/ATI HD Audio Controller exist */
+        switch (chip->driver_type) {
+        case AZX_DRIVER_VIA:
+        case AZX_DRIVER_ATI:
                 chip->via_dmapos_patch = 1;
                 /* Use link position directly, avoid any transfer problem. */
                 return POS_FIX_LPIB;
         }
         chip->via_dmapos_patch = 0;
 
-        if (fix == POS_FIX_AUTO) {
-                q = snd_pci_quirk_lookup(chip->pci, position_fix_list);
-                if (q) {
-                        printk(KERN_INFO
-                                    "hda_intel: position_fix set to %d "
-                                    "for device %04x:%04x\n",
-                                    q->value, q->subvendor, q->subdevice);
-                        return q->value;
-                }
+        q = snd_pci_quirk_lookup(chip->pci, position_fix_list);
+        if (q) {
+                printk(KERN_INFO
+                       "hda_intel: position_fix set to %d "
+                       "for device %04x:%04x\n",
+                       q->value, q->subvendor, q->subdevice);
+                return q->value;
         }
-        return fix;
+        return POS_FIX_AUTO;
 }
 
 /*
@@ -2098,6 +2100,8 @@ static struct snd_pci_quirk probe_mask_list[] __devinitdata = {
         SND_PCI_QUIRK(0x1028, 0x20ac, "Dell Studio Desktop", 0x01),
         /* including bogus ALC268 in slot#2 that conflicts with ALC888 */
         SND_PCI_QUIRK(0x17c0, 0x4085, "Medion MD96630", 0x01),
+        /* conflict of ALC268 in slot#3 (digital I/O); a temporary fix */
+        SND_PCI_QUIRK(0x1179, 0xff00, "Toshiba laptop", 0x03),
         {}
 };
 
@@ -2211,9 +2215,17 @@ static int __devinit azx_create(struct snd_card *card, struct pci_dev *pci,
         gcap = azx_readw(chip, GCAP);
         snd_printdd("chipset global capabilities = 0x%x\n", gcap);
 
+        /* ATI chips seems buggy about 64bit DMA addresses */
+        if (chip->driver_type == AZX_DRIVER_ATI)
+                gcap &= ~0x01;
+
         /* allow 64bit DMA address if supported by H/W */
         if ((gcap & 0x01) && !pci_set_dma_mask(pci, DMA_64BIT_MASK))
                 pci_set_consistent_dma_mask(pci, DMA_64BIT_MASK);
+        else {
+                pci_set_dma_mask(pci, DMA_32BIT_MASK);
+                pci_set_consistent_dma_mask(pci, DMA_32BIT_MASK);
+        }
 
         /* read number of streams from GCAP register instead of using
          * hardcoded value
@@ -2468,7 +2480,6 @@ static struct pci_driver driver = {
         .remove = __devexit_p(azx_remove),
 #ifdef CONFIG_PM
         .suspend = azx_suspend,
-        .resume_early = azx_resume_early,
         .resume = azx_resume,
 #endif
 };
diff --git a/sound/pci/hda/hda_local.h b/sound/pci/hda/hda_local.h
index 1dd8716c387..44f189cb97a 100644
--- a/sound/pci/hda/hda_local.h
+++ b/sound/pci/hda/hda_local.h
@@ -251,6 +251,8 @@ int snd_hda_multi_out_dig_prepare(struct hda_codec *codec,
                                   unsigned int stream_tag,
                                   unsigned int format,
                                   struct snd_pcm_substream *substream);
+int snd_hda_multi_out_dig_cleanup(struct hda_codec *codec,
+                                  struct hda_multi_out *mout);
 int snd_hda_multi_out_analog_open(struct hda_codec *codec,
                                   struct hda_multi_out *mout,
                                   struct snd_pcm_substream *substream,
diff --git a/sound/pci/hda/patch_analog.c b/sound/pci/hda/patch_analog.c
index 2e7371ec2e2..e48612323aa 100644
--- a/sound/pci/hda/patch_analog.c
+++ b/sound/pci/hda/patch_analog.c
@@ -275,6 +275,14 @@ static int ad198x_dig_playback_pcm_prepare(struct hda_pcm_stream *hinfo,
                                              format, substream);
 }
 
+static int ad198x_dig_playback_pcm_cleanup(struct hda_pcm_stream *hinfo,
+                                           struct hda_codec *codec,
+                                           struct snd_pcm_substream *substream)
+{
+        struct ad198x_spec *spec = codec->spec;
+        return snd_hda_multi_out_dig_cleanup(codec, &spec->multiout);
+}
+
 /*
  * Analog capture
  */
@@ -333,7 +341,8 @@ static struct hda_pcm_stream ad198x_pcm_digital_playback = {
         .ops = {
                 .open = ad198x_dig_playback_pcm_open,
                 .close = ad198x_dig_playback_pcm_close,
-                .prepare = ad198x_dig_playback_pcm_prepare
+                .prepare = ad198x_dig_playback_pcm_prepare,
+                .cleanup = ad198x_dig_playback_pcm_cleanup
         },
 };
 
@@ -1885,8 +1894,8 @@ static hda_nid_t ad1988_capsrc_nids[3] = {
 #define AD1988_SPDIF_OUT_HDMI   0x0b
 #define AD1988_SPDIF_IN         0x07
 
-static hda_nid_t ad1989b_slave_dig_outs[2] = {
-        AD1988_SPDIF_OUT, AD1988_SPDIF_OUT_HDMI
+static hda_nid_t ad1989b_slave_dig_outs[] = {
+        AD1988_SPDIF_OUT, AD1988_SPDIF_OUT_HDMI, 0
 };
 
 static struct hda_input_mux ad1988_6stack_capture_source = {
diff --git a/sound/pci/hda/patch_intelhdmi.c b/sound/pci/hda/patch_intelhdmi.c
index 3564f4e4b74..fcc77fec448 100644
--- a/sound/pci/hda/patch_intelhdmi.c
+++ b/sound/pci/hda/patch_intelhdmi.c
@@ -49,11 +49,6 @@ static struct hda_verb pinout_enable_verb[] = {
         {} /* terminator */
 };
 
-static struct hda_verb pinout_disable_verb[] = {
-        {PIN_NID, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x00},
-        {}
-};
-
 static struct hda_verb unsolicited_response_verb[] = {
         {PIN_NID, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN |
                                                   INTEL_HDMI_EVENT_TAG},
@@ -248,10 +243,6 @@ static void hdmi_write_dip_byte(struct hda_codec *codec, hda_nid_t nid,
 
 static void hdmi_enable_output(struct hda_codec *codec)
 {
-        /* Enable Audio InfoFrame Transmission */
-        hdmi_set_dip_index(codec, PIN_NID, 0x0, 0x0);
-        snd_hda_codec_write(codec, PIN_NID, 0, AC_VERB_SET_HDMI_DIP_XMIT,
-                                                AC_DIPXMIT_BEST);
         /* Unmute */
         if (get_wcaps(codec, PIN_NID) & AC_WCAP_OUT_AMP)
                 snd_hda_codec_write(codec, PIN_NID, 0,
@@ -260,17 +251,24 @@ static void hdmi_enable_output(struct hda_codec *codec)
         snd_hda_sequence_write(codec, pinout_enable_verb);
 }
 
-static void hdmi_disable_output(struct hda_codec *codec)
+/*
+ * Enable Audio InfoFrame Transmission
+ */
+static void hdmi_start_infoframe_trans(struct hda_codec *codec)
 {
-        snd_hda_sequence_write(codec, pinout_disable_verb);
-        if (get_wcaps(codec, PIN_NID) & AC_WCAP_OUT_AMP)
-                snd_hda_codec_write(codec, PIN_NID, 0,
-                                AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE);
+        hdmi_set_dip_index(codec, PIN_NID, 0x0, 0x0);
+        snd_hda_codec_write(codec, PIN_NID, 0, AC_VERB_SET_HDMI_DIP_XMIT,
+                                                AC_DIPXMIT_BEST);
+}
 
-        /*
-         * FIXME: noises may arise when playing music after reloading the
-         * kernel module, until the next X restart or monitor repower.
-         */
+/*
+ * Disable Audio InfoFrame Transmission
+ */
+static void hdmi_stop_infoframe_trans(struct hda_codec *codec)
+{
+        hdmi_set_dip_index(codec, PIN_NID, 0x0, 0x0);
+        snd_hda_codec_write(codec, PIN_NID, 0, AC_VERB_SET_HDMI_DIP_XMIT,
+                                                AC_DIPXMIT_DISABLE);
 }
 
 static int hdmi_get_channel_count(struct hda_codec *codec)
@@ -368,11 +366,16 @@ static void hdmi_fill_audio_infoframe(struct hda_codec *codec,
                                         struct hdmi_audio_infoframe *ai)
 {
         u8 *params = (u8 *)ai;
+        u8 sum = 0;
         int i;
 
         hdmi_debug_dip_size(codec);
         hdmi_clear_dip_buffers(codec); /* be paranoid */
 
+        for (i = 0; i < sizeof(ai); i++)
+                sum += params[i];
+        ai->checksum = - sum;
+
         hdmi_set_dip_index(codec, PIN_NID, 0x0, 0x0);
         for (i = 0; i < sizeof(ai); i++)
                 hdmi_write_dip_byte(codec, PIN_NID, params[i]);
@@ -419,14 +422,18 @@ static int hdmi_setup_channel_allocation(struct hda_codec *codec,
         /*
          * CA defaults to 0 for basic stereo audio
          */
-        if (!eld->eld_ver)
-                return 0;
-        if (!eld->spk_alloc)
-                return 0;
         if (channels <= 2)
                 return 0;
 
         /*
+         * HDMI sink's ELD info cannot always be retrieved for now, e.g.
+         * in console or for audio devices. Assume the highest speakers
+         * configuration, to _not_ prohibit multi-channel audio playback.
+         */
+        if (!eld->spk_alloc)
+                eld->spk_alloc = 0xffff;
+
+        /*
          * expand ELD's speaker allocation mask
          *
          * ELD tells the speaker mask in a compact(paired) form,
@@ -485,6 +492,7 @@ static void hdmi_setup_audio_infoframe(struct hda_codec *codec,
         hdmi_setup_channel_mapping(codec, &ai);
 
         hdmi_fill_audio_infoframe(codec, &ai);
+        hdmi_start_infoframe_trans(codec);
 }
 
 
@@ -562,7 +570,7 @@ static int intel_hdmi_playback_pcm_close(struct hda_pcm_stream *hinfo,
 {
         struct intel_hdmi_spec *spec = codec->spec;
 
-        hdmi_disable_output(codec);
+        hdmi_stop_infoframe_trans(codec);
 
         return snd_hda_multi_out_dig_close(codec, &spec->multiout);
 }
@@ -582,8 +590,6 @@ static int intel_hdmi_playback_pcm_prepare(struct hda_pcm_stream *hinfo,
 
         hdmi_setup_audio_infoframe(codec, substream);
 
-        hdmi_enable_output(codec);
-
         return 0;
 }
 
@@ -628,8 +634,7 @@ static int intel_hdmi_build_controls(struct hda_codec *codec)
 
 static int intel_hdmi_init(struct hda_codec *codec)
 {
-        /* disable audio output as early as possible */
-        hdmi_disable_output(codec);
+        hdmi_enable_output(codec);
 
         snd_hda_sequence_write(codec, unsolicited_response_verb);
 
@@ -679,6 +684,7 @@ static struct hda_codec_preset snd_hda_preset_intelhdmi[] = {
         { .id = 0x80862801, .name = "G45 DEVBLC", .patch = patch_intel_hdmi },
         { .id = 0x80862802, .name = "G45 DEVCTG", .patch = patch_intel_hdmi },
         { .id = 0x80862803, .name = "G45 DEVELK", .patch = patch_intel_hdmi },
+        { .id = 0x80862804, .name = "G45 DEVIBX", .patch = patch_intel_hdmi },
         { .id = 0x10951392, .name = "SiI1392 HDMI",     .patch = patch_intel_hdmi },
         {} /* terminator */
 };
@@ -687,6 +693,7 @@ MODULE_ALIAS("snd-hda-codec-id:808629fb");
 MODULE_ALIAS("snd-hda-codec-id:80862801");
 MODULE_ALIAS("snd-hda-codec-id:80862802");
 MODULE_ALIAS("snd-hda-codec-id:80862803");
+MODULE_ALIAS("snd-hda-codec-id:80862804");
 MODULE_ALIAS("snd-hda-codec-id:10951392");
 
 MODULE_LICENSE("GPL");
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index 0040101f615..6c26afcb826 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -1037,6 +1037,7 @@ do_sku:
                 case 0x10ec0267:
                 case 0x10ec0268:
                 case 0x10ec0269:
+                case 0x10ec0272:
                 case 0x10ec0660:
                 case 0x10ec0662:
                 case 0x10ec0663:
@@ -1065,6 +1066,7 @@ do_sku:
                 case 0x10ec0882:
                 case 0x10ec0883:
                 case 0x10ec0885:
+                case 0x10ec0887:
                 case 0x10ec0889:
                         snd_hda_codec_write(codec, 0x20, 0,
                                             AC_VERB_SET_COEF_INDEX, 7);
@@ -7015,6 +7017,7 @@ static int patch_alc882(struct hda_codec *codec)
                 case 0x106b3e00: /* iMac 24 Aluminium */
                         board_config = ALC885_IMAC24;
                         break;
+                case 0x106b00a0: /* MacBookPro3,1 - Another revision */
                 case 0x106b00a1: /* Macbook (might be wrong - PCI SSID?) */
                 case 0x106b00a4: /* MacbookPro4,1 */
                 case 0x106b2c00: /* Macbook Pro rev3 */
@@ -8467,6 +8470,8 @@ static struct snd_pci_quirk alc883_cfg_tbl[] = {
                 ALC888_ACER_ASPIRE_4930G),
         SND_PCI_QUIRK(0x1025, 0x015e, "Acer Aspire 6930G",
                 ALC888_ACER_ASPIRE_4930G),
+        SND_PCI_QUIRK(0x1025, 0x0166, "Acer Aspire 6530G",
+                ALC888_ACER_ASPIRE_4930G),
         SND_PCI_QUIRK(0x1025, 0, "Acer laptop", ALC883_ACER), /* default Acer */
         SND_PCI_QUIRK(0x1028, 0x020d, "Dell Inspiron 530", ALC888_6ST_DELL),
         SND_PCI_QUIRK(0x103c, 0x2a3d, "HP Pavillion", ALC883_6ST_DIG),
@@ -8476,6 +8481,7 @@ static struct snd_pci_quirk alc883_cfg_tbl[] = {
         SND_PCI_QUIRK(0x103c, 0x2a66, "HP Acacia", ALC888_3ST_HP),
         SND_PCI_QUIRK(0x1043, 0x1873, "Asus M90V", ALC888_ASUS_M90V),
         SND_PCI_QUIRK(0x1043, 0x8249, "Asus M2A-VM HDMI", ALC883_3ST_6ch_DIG),
+        SND_PCI_QUIRK(0x1043, 0x8284, "Asus Z37E", ALC883_6ST_DIG),
         SND_PCI_QUIRK(0x1043, 0x82fe, "Asus P5Q-EM HDMI", ALC1200_ASUS_P5Q),
         SND_PCI_QUIRK(0x1043, 0x835f, "Asus Eee 1601", ALC888_ASUS_EEE1601),
         SND_PCI_QUIRK(0x105b, 0x0ce8, "Foxconn P35AX-S", ALC883_6ST_DIG),
@@ -8515,6 +8521,8 @@ static struct snd_pci_quirk alc883_cfg_tbl[] = {
         SND_PCI_QUIRK(0x1558, 0, "Clevo laptop", ALC883_LAPTOP_EAPD),
         SND_PCI_QUIRK(0x15d9, 0x8780, "Supermicro PDSBA", ALC883_3ST_6ch),
         SND_PCI_QUIRK(0x161f, 0x2054, "Medion laptop", ALC883_MEDION),
+        SND_PCI_QUIRK(0x1734, 0x1107, "FSC AMILO Xi2550",
+                      ALC883_FUJITSU_PI2515),
         SND_PCI_QUIRK(0x1734, 0x1108, "Fujitsu AMILO Pi2515", ALC883_FUJITSU_PI2515),
         SND_PCI_QUIRK(0x1734, 0x113d, "Fujitsu AMILO Xa3530",
                 ALC888_FUJITSU_XA3530),
@@ -10549,6 +10557,7 @@ static struct snd_pci_quirk alc262_cfg_tbl[] = {
         SND_PCI_QUIRK(0x103c, 0x1309, "HP xw4*00", ALC262_HP_BPC),
         SND_PCI_QUIRK(0x103c, 0x130a, "HP xw6*00", ALC262_HP_BPC),
         SND_PCI_QUIRK(0x103c, 0x130b, "HP xw8*00", ALC262_HP_BPC),
+        SND_PCI_QUIRK(0x103c, 0x170b, "HP xw*", ALC262_HP_BPC),
         SND_PCI_QUIRK(0x103c, 0x2800, "HP D7000", ALC262_HP_BPC_D7000_WL),
         SND_PCI_QUIRK(0x103c, 0x2801, "HP D7000", ALC262_HP_BPC_D7000_WF),
         SND_PCI_QUIRK(0x103c, 0x2802, "HP D7000", ALC262_HP_BPC_D7000_WL),
diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c
index 38428e22428..6094344fb22 100644
--- a/sound/pci/hda/patch_sigmatel.c
+++ b/sound/pci/hda/patch_sigmatel.c
@@ -1207,7 +1207,7 @@ static const char *slave_vols[] = {
         "LFE Playback Volume",
         "Side Playback Volume",
         "Headphone Playback Volume",
-        "Headphone Playback Volume",
+        "Headphone2 Playback Volume",
         "Speaker Playback Volume",
         "External Speaker Playback Volume",
         "Speaker2 Playback Volume",
@@ -1221,7 +1221,7 @@ static const char *slave_sws[] = {
         "LFE Playback Switch",
         "Side Playback Switch",
         "Headphone Playback Switch",
-        "Headphone Playback Switch",
+        "Headphone2 Playback Switch",
         "Speaker Playback Switch",
         "External Speaker Playback Switch",
         "Speaker2 Playback Switch",
@@ -1799,7 +1799,7 @@ static struct snd_pci_quirk stac92hd71bxx_cfg_tbl[] = {
         SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x30f2,
                       "HP dv5", STAC_HP_M4),
         SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x30f4,
-                      "HP dv7", STAC_HP_M4),
+                      "HP dv7", STAC_HP_DV5),
         SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x30f7,
                       "HP dv4", STAC_HP_DV5),
         SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x30fc,
@@ -2442,6 +2442,14 @@ static int stac92xx_dig_playback_pcm_prepare(struct hda_pcm_stream *hinfo,
                                              stream_tag, format, substream);
 }
 
+static int stac92xx_dig_playback_pcm_cleanup(struct hda_pcm_stream *hinfo,
+                                        struct hda_codec *codec,
+                                        struct snd_pcm_substream *substream)
+{
+        struct sigmatel_spec *spec = codec->spec;
+        return snd_hda_multi_out_dig_cleanup(codec, &spec->multiout);
+}
+
 
 /*
  * Analog capture callbacks
@@ -2486,7 +2494,8 @@ static struct hda_pcm_stream stac92xx_pcm_digital_playback = {
         .ops = {
                 .open = stac92xx_dig_playback_pcm_open,
                 .close = stac92xx_dig_playback_pcm_close,
-                .prepare = stac92xx_dig_playback_pcm_prepare
+                .prepare = stac92xx_dig_playback_pcm_prepare,
+                .cleanup = stac92xx_dig_playback_pcm_cleanup
         },
 };
 
@@ -3507,6 +3516,7 @@ static int stac92xx_parse_auto_config(struct hda_codec *codec, hda_nid_t dig_out
         if (! spec->autocfg.line_outs)
                 return 0; /* can't find valid pin config */
 
+#if 0 /* FIXME: temporarily disabled */
         /* If we have no real line-out pin and multiple hp-outs, HPs should
          * be set up as multi-channel outputs.
          */
@@ -3526,6 +3536,7 @@ static int stac92xx_parse_auto_config(struct hda_codec *codec, hda_nid_t dig_out
                 spec->autocfg.line_out_type = AUTO_PIN_HP_OUT;
                 spec->autocfg.hp_outs = 0;
         }
+#endif /* FIXME: temporarily disabled */
         if (spec->autocfg.mono_out_pin) {
                 int dir = get_wcaps(codec, spec->autocfg.mono_out_pin) &
                         (AC_WCAP_OUT_AMP | AC_WCAP_IN_AMP);
@@ -4980,7 +4991,7 @@ again:
         case STAC_DELL_M4_3:
                 spec->num_dmics = 1;
                 spec->num_smuxes = 0;
-                spec->num_dmuxes = 0;
+                spec->num_dmuxes = 1;
                 break;
         default:
                 spec->num_dmics = STAC92HD71BXX_NUM_DMICS;