16 files changed, 128 insertions, 22 deletions

diff --git a/sound/pci/ac97/ac97_codec.c b/sound/pci/ac97/ac97_codec.c
index 6704acbca8c0..bd510eceff1f 100644
--- a/sound/pci/ac97/ac97_codec.c
+++ b/sound/pci/ac97/ac97_codec.c
@@ -1927,9 +1927,9 @@ static int snd_ac97_dev_register(struct snd_device *device)
         ac97->dev.bus = &ac97_bus_type;
         ac97->dev.parent = ac97->bus->card->dev;
         ac97->dev.release = ac97_device_release;
-        snprintf(ac97->dev.bus_id, BUS_ID_SIZE, "%d-%d:%s",
-                 ac97->bus->card->number, ac97->num,
-                 snd_ac97_get_short_name(ac97));
+        dev_set_name(&ac97->dev, "%d-%d:%s",
+                     ac97->bus->card->number, ac97->num,
+                     snd_ac97_get_short_name(ac97));
         if ((err = device_register(&ac97->dev)) < 0) {
                 snd_printk(KERN_ERR "Can't register ac97 bus\n");
                 ac97->dev.bus = NULL;
diff --git a/sound/pci/ad1889.c b/sound/pci/ad1889.c
index 92f3a976ef2e..a7f38e63303f 100644
--- a/sound/pci/ad1889.c
+++ b/sound/pci/ad1889.c
@@ -932,7 +932,7 @@ snd_ad1889_create(struct snd_card *card,
                 goto free_and_ret;
 
         chip->bar = pci_resource_start(pci, 0);
-        chip->iobase = ioremap_nocache(chip->bar, pci_resource_len(pci, 0));
+        chip->iobase = pci_ioremap_bar(pci, 0);
         if (chip->iobase == NULL) {
                 printk(KERN_ERR PFX "unable to reserve region.\n");
                 err = -EBUSY;
diff --git a/sound/pci/atiixp.c b/sound/pci/atiixp.c
index 085a52b8c807..226fe8237d31 100644
--- a/sound/pci/atiixp.c
+++ b/sound/pci/atiixp.c
@@ -1609,7 +1609,7 @@ static int __devinit snd_atiixp_create(struct snd_card *card,
                 return err;
         }
         chip->addr = pci_resource_start(pci, 0);
-        chip->remap_addr = ioremap_nocache(chip->addr, pci_resource_len(pci, 0));
+        chip->remap_addr = pci_ioremap_bar(pci, 0);
         if (chip->remap_addr == NULL) {
                 snd_printk(KERN_ERR "AC'97 space ioremap problem\n");
                 snd_atiixp_free(chip);
diff --git a/sound/pci/atiixp_modem.c b/sound/pci/atiixp_modem.c
index 2f106306c7fe..0e6e5cc1c501 100644
--- a/sound/pci/atiixp_modem.c
+++ b/sound/pci/atiixp_modem.c
@@ -1252,7 +1252,7 @@ static int __devinit snd_atiixp_create(struct snd_card *card,
                 return err;
         }
         chip->addr = pci_resource_start(pci, 0);
-        chip->remap_addr = ioremap_nocache(chip->addr, pci_resource_len(pci, 0));
+        chip->remap_addr = pci_ioremap_bar(pci, 0);
         if (chip->remap_addr == NULL) {
                 snd_printk(KERN_ERR "AC'97 space ioremap problem\n");
                 snd_atiixp_free(chip);
diff --git a/sound/pci/au88x0/au88x0.c b/sound/pci/au88x0/au88x0.c
index 68368e490074..a36d4d1fd419 100644
--- a/sound/pci/au88x0/au88x0.c
+++ b/sound/pci/au88x0/au88x0.c
@@ -180,8 +180,7 @@ snd_vortex_create(struct snd_card *card, struct pci_dev *pci, vortex_t ** rchip)
         if ((err = pci_request_regions(pci, CARD_NAME_SHORT)) != 0)
                 goto regions_out;
 
-        chip->mmio = ioremap_nocache(pci_resource_start(pci, 0),
-                                     pci_resource_len(pci, 0));
+        chip->mmio = pci_ioremap_bar(pci, 0);
         if (!chip->mmio) {
                 printk(KERN_ERR "MMIO area remap failed.\n");
                 err = -ENOMEM;
diff --git a/sound/pci/bt87x.c b/sound/pci/bt87x.c
index 3aa8d973540a..1aa1c0402540 100644
--- a/sound/pci/bt87x.c
+++ b/sound/pci/bt87x.c
@@ -749,8 +749,7 @@ static int __devinit snd_bt87x_create(struct snd_card *card,
                 pci_disable_device(pci);
                 return err;
         }
-        chip->mmio = ioremap_nocache(pci_resource_start(pci, 0),
-                                     pci_resource_len(pci, 0));
+        chip->mmio = pci_ioremap_bar(pci, 0);
         if (!chip->mmio) {
                 snd_printk(KERN_ERR "cannot remap io memory\n");
                 err = -ENOMEM;
diff --git a/sound/pci/cs4281.c b/sound/pci/cs4281.c
index ef9308f7c45b..192e7842e181 100644
--- a/sound/pci/cs4281.c
+++ b/sound/pci/cs4281.c
@@ -1382,8 +1382,8 @@ static int __devinit snd_cs4281_create(struct snd_card *card,
         chip->ba0_addr = pci_resource_start(pci, 0);
         chip->ba1_addr = pci_resource_start(pci, 1);
 
-        chip->ba0 = ioremap_nocache(chip->ba0_addr, pci_resource_len(pci, 0));
-        chip->ba1 = ioremap_nocache(chip->ba1_addr, pci_resource_len(pci, 1));
+        chip->ba0 = pci_ioremap_bar(pci, 0);
+        chip->ba1 = pci_ioremap_bar(pci, 1);
         if (!chip->ba0 || !chip->ba1) {
                 snd_cs4281_free(chip);
                 return -ENOMEM;
diff --git a/sound/pci/cs5530.c b/sound/pci/cs5530.c
index 7ff8b68e997e..6dea5b5cc774 100644
--- a/sound/pci/cs5530.c
+++ b/sound/pci/cs5530.c
@@ -2,7 +2,7 @@
  * cs5530.c - Initialisation code for Cyrix/NatSemi VSA1 softaudio
  *
  *      (C) Copyright 2007 Ash Willis <ashwillis@programmer.net>
- *      (C) Copyright 2003 Red Hat Inc <alan@redhat.com>
+ *      (C) Copyright 2003 Red Hat Inc <alan@lxorguk.ukuu.org.uk>
  *
  * This driver was ported (shamelessly ripped ;) from oss/kahlua.c but I did
  * mess with it a bit. The chip seems to have to have trouble with full duplex
@@ -132,7 +132,7 @@ static int __devinit snd_cs5530_create(struct snd_card *card,
         }
         chip->pci_base = pci_resource_start(pci, 0);
 
-        mem = ioremap_nocache(chip->pci_base, pci_resource_len(pci, 0));
+        mem = pci_ioremap_bar(pci, 0);
         if (mem == NULL) {
                 kfree(chip);
                 pci_disable_device(pci);
diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c
index 6447754ae56e..ba1ab737b55f 100644
--- a/sound/pci/hda/hda_codec.c
+++ b/sound/pci/hda/hda_codec.c
@@ -64,6 +64,7 @@ static struct hda_vendor_id hda_vendor_ids[] = {
         { 0x14f1, "Conexant" },
         { 0x17e8, "Chrontel" },
         { 0x1854, "LG" },
+        { 0x1aec, "Wolfson Microelectronics" },
         { 0x434d, "C-Media" },
         { 0x8384, "SigmaTel" },
         {} /* terminator */
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
index 9f316c1b2790..35722ec920cb 100644
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@ -45,6 +45,7 @@
 #include <linux/slab.h>
 #include <linux/pci.h>
 #include <linux/mutex.h>
+#include <linux/reboot.h>
 #include <sound/core.h>
 #include <sound/initval.h>
 #include "hda_codec.h"
@@ -397,6 +398,9 @@ struct azx {
 
         /* for pending irqs */
         struct work_struct irq_pending_work;
+
+        /* reboot notifier (for mysterious hangup problem at power-down) */
+        struct notifier_block reboot_notifier;
 };
 
 /* driver types */
@@ -1979,12 +1983,36 @@ static int azx_resume(struct pci_dev *pci)
 
 
 /*
+ * reboot notifier for hang-up problem at power-down
+ */
+static int azx_halt(struct notifier_block *nb, unsigned long event, void *buf)
+{
+        struct azx *chip = container_of(nb, struct azx, reboot_notifier);
+        azx_stop_chip(chip);
+        return NOTIFY_OK;
+}
+
+static void azx_notifier_register(struct azx *chip)
+{
+        chip->reboot_notifier.notifier_call = azx_halt;
+        register_reboot_notifier(&chip->reboot_notifier);
+}
+
+static void azx_notifier_unregister(struct azx *chip)
+{
+        if (chip->reboot_notifier.notifier_call)
+                unregister_reboot_notifier(&chip->reboot_notifier);
+}
+
+/*
  * destructor
  */
 static int azx_free(struct azx *chip)
 {
         int i;
 
+        azx_notifier_unregister(chip);
+
         if (chip->initialized) {
                 azx_clear_irq_pending(chip);
                 for (i = 0; i < chip->num_streams; i++)
@@ -2158,7 +2186,7 @@ static int __devinit azx_create(struct snd_card *card, struct pci_dev *pci,
         }
 
         chip->addr = pci_resource_start(pci, 0);
-        chip->remap_addr = ioremap_nocache(chip->addr, pci_resource_len(pci,0));
+        chip->remap_addr = pci_ioremap_bar(pci, 0);
         if (chip->remap_addr == NULL) {
                 snd_printk(KERN_ERR SFX "ioremap error\n");
                 err = -ENXIO;
@@ -2348,6 +2376,7 @@ static int __devinit azx_probe(struct pci_dev *pci,
         pci_set_drvdata(pci, card);
         chip->running = 1;
         power_down_all_codecs(chip);
+        azx_notifier_register(chip);
 
         dev++;
         return err;
diff --git a/sound/pci/hda/patch_analog.c b/sound/pci/hda/patch_analog.c
index 2b00c4afdf97..d3fd432cb3ea 100644
--- a/sound/pci/hda/patch_analog.c
+++ b/sound/pci/hda/patch_analog.c
@@ -3860,6 +3860,7 @@ static const char *ad1884a_models[AD1884A_MODELS] = {
 
 static struct snd_pci_quirk ad1884a_cfg_tbl[] = {
         SND_PCI_QUIRK(0x103c, 0x3030, "HP", AD1884A_MOBILE),
+        SND_PCI_QUIRK(0x103c, 0x3056, "HP", AD1884A_MOBILE),
         SND_PCI_QUIRK(0x17aa, 0x20ac, "Thinkpad X300", AD1884A_THINKPAD),
         {}
 };
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index ef4955c73c88..4eceab9bd109 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -307,6 +307,13 @@ struct alc_spec {
         /* for PLL fix */
         hda_nid_t pll_nid;
         unsigned int pll_coef_idx, pll_coef_bit;
+
+#ifdef SND_HDA_NEEDS_RESUME
+#define ALC_MAX_PINS    16
+        unsigned int num_pins;
+        hda_nid_t pin_nids[ALC_MAX_PINS];
+        unsigned int pin_cfgs[ALC_MAX_PINS];
+#endif
 };
 
 /*
@@ -2778,6 +2785,64 @@ static void alc_free(struct hda_codec *codec)
         codec->spec = NULL; /* to be sure */
 }
 
+#ifdef SND_HDA_NEEDS_RESUME
+static void store_pin_configs(struct hda_codec *codec)
+{
+        struct alc_spec *spec = codec->spec;
+        hda_nid_t nid, end_nid;
+
+        end_nid = codec->start_nid + codec->num_nodes;
+        for (nid = codec->start_nid; nid < end_nid; nid++) {
+                unsigned int wid_caps = get_wcaps(codec, nid);
+                unsigned int wid_type =
+                        (wid_caps & AC_WCAP_TYPE) >> AC_WCAP_TYPE_SHIFT;
+                if (wid_type != AC_WID_PIN)
+                        continue;
+                if (spec->num_pins >= ARRAY_SIZE(spec->pin_nids))
+                        break;
+                spec->pin_nids[spec->num_pins] = nid;
+                spec->pin_cfgs[spec->num_pins] =
+                        snd_hda_codec_read(codec, nid, 0,
+                                           AC_VERB_GET_CONFIG_DEFAULT, 0);
+                spec->num_pins++;
+        }
+}
+
+static void resume_pin_configs(struct hda_codec *codec)
+{
+        struct alc_spec *spec = codec->spec;
+        int i;
+
+        for (i = 0; i < spec->num_pins; i++) {
+                hda_nid_t pin_nid = spec->pin_nids[i];
+                unsigned int pin_config = spec->pin_cfgs[i];
+                snd_hda_codec_write(codec, pin_nid, 0,
+                                    AC_VERB_SET_CONFIG_DEFAULT_BYTES_0,
+                                    pin_config & 0x000000ff);
+                snd_hda_codec_write(codec, pin_nid, 0,
+                                    AC_VERB_SET_CONFIG_DEFAULT_BYTES_1,
+                                    (pin_config & 0x0000ff00) >> 8);
+                snd_hda_codec_write(codec, pin_nid, 0,
+                                    AC_VERB_SET_CONFIG_DEFAULT_BYTES_2,
+                                    (pin_config & 0x00ff0000) >> 16);
+                snd_hda_codec_write(codec, pin_nid, 0,
+                                    AC_VERB_SET_CONFIG_DEFAULT_BYTES_3,
+                                    pin_config >> 24);
+        }
+}
+
+static int alc_resume(struct hda_codec *codec)
+{
+        resume_pin_configs(codec);
+        codec->patch_ops.init(codec);
+        snd_hda_codec_resume_amp(codec);
+        snd_hda_codec_resume_cache(codec);
+        return 0;
+}
+#else
+#define store_pin_configs(codec)
+#endif
+
 /*
  */
 static struct hda_codec_ops alc_patch_ops = {
@@ -2786,6 +2851,9 @@ static struct hda_codec_ops alc_patch_ops = {
         .init = alc_init,
         .free = alc_free,
         .unsol_event = alc_unsol_event,
+#ifdef SND_HDA_NEEDS_RESUME
+        .resume = alc_resume,
+#endif
 #ifdef CONFIG_SND_HDA_POWER_SAVE
         .check_power_status = alc_check_power_status,
 #endif
@@ -3832,6 +3900,7 @@ static int alc880_parse_auto_config(struct hda_codec *codec)
         spec->num_mux_defs = 1;
         spec->input_mux = &spec->private_imux;
 
+        store_pin_configs(codec);
         return 1;
 }
 
@@ -5250,6 +5319,7 @@ static int alc260_parse_auto_config(struct hda_codec *codec)
         }
         spec->num_mixers++;
 
+        store_pin_configs(codec);
         return 1;
 }
 
@@ -10313,6 +10383,7 @@ static int alc262_parse_auto_config(struct hda_codec *codec)
         if (err < 0)
                 return err;
 
+        store_pin_configs(codec);
         return 1;
 }
 
@@ -11447,6 +11518,7 @@ static int alc268_parse_auto_config(struct hda_codec *codec)
         if (err < 0)
                 return err;
 
+        store_pin_configs(codec);
         return 1;
 }
 
@@ -12230,6 +12302,7 @@ static int alc269_parse_auto_config(struct hda_codec *codec)
         spec->mixers[spec->num_mixers] = alc269_capture_mixer;
         spec->num_mixers++;
 
+        store_pin_configs(codec);
         return 1;
 }
 
@@ -13316,6 +13389,7 @@ static int alc861_parse_auto_config(struct hda_codec *codec)
         spec->mixers[spec->num_mixers] = alc861_capture_mixer;
         spec->num_mixers++;
 
+        store_pin_configs(codec);
         return 1;
 }
 
@@ -14427,6 +14501,7 @@ static int alc861vd_parse_auto_config(struct hda_codec *codec)
         if (err < 0)
                 return err;
 
+        store_pin_configs(codec);
         return 1;
 }
 
@@ -16258,6 +16333,8 @@ static int alc662_parse_auto_config(struct hda_codec *codec)
 
         spec->mixers[spec->num_mixers] = alc662_capture_mixer;
         spec->num_mixers++;
+
+        store_pin_configs(codec);
         return 1;
 }
 
diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c
index 788fdc6f3264..df9b0bc7f878 100644
--- a/sound/pci/hda/patch_sigmatel.c
+++ b/sound/pci/hda/patch_sigmatel.c
@@ -566,10 +566,8 @@ static int stac92xx_smux_enum_put(struct snd_kcontrol *kcontrol,
                         nid = codec->slave_dig_outs[smux_idx - 1];
                 if (spec->cur_smux[smux_idx] == smux->num_items - 1)
                         val = AMP_OUT_MUTE;
-                if (smux_idx == 0)
-                        nid = spec->multiout.dig_out_nid;
                 else
-                        nid = codec->slave_dig_outs[smux_idx - 1];
+                        val = AMP_OUT_UNMUTE;
                 /* un/mute SPDIF out */
                 snd_hda_codec_write_cache(codec, nid, 0,
                         AC_VERB_SET_AMP_GAIN_MUTE, val);
diff --git a/sound/pci/ice1712/ice1712.c b/sound/pci/ice1712/ice1712.c
index 5b442383fcda..58d7cda03de5 100644
--- a/sound/pci/ice1712/ice1712.c
+++ b/sound/pci/ice1712/ice1712.c
@@ -2688,12 +2688,13 @@ static int __devinit snd_ice1712_probe(struct pci_dev *pci,
                 return err;
         }
 
-        if (ice_has_con_ac97(ice))
+        if (ice_has_con_ac97(ice)) {
                 err = snd_ice1712_pcm(ice, pcm_dev++, NULL);
                 if (err < 0) {
                         snd_card_free(card);
                         return err;
                 }
+        }
 
         err = snd_ice1712_ac97_mixer(ice);
         if (err < 0) {
@@ -2715,12 +2716,13 @@ static int __devinit snd_ice1712_probe(struct pci_dev *pci,
                 }
         }
 
-        if (ice_has_con_ac97(ice))
+        if (ice_has_con_ac97(ice)) {
                 err = snd_ice1712_pcm_ds(ice, pcm_dev++, NULL);
                 if (err < 0) {
                         snd_card_free(card);
                         return err;
                 }
+        }
 
         if (!c->no_mpu401) {
                 err = snd_mpu401_uart_new(card, 0, MPU401_HW_ICE1712,
diff --git a/sound/pci/intel8x0.c b/sound/pci/intel8x0.c
index c88d1eace1c4..19d3391e229f 100644
--- a/sound/pci/intel8x0.c
+++ b/sound/pci/intel8x0.c
@@ -2702,6 +2702,7 @@ static struct snd_pci_quirk intel8x0_clock_list[] __devinitdata = {
         SND_PCI_QUIRK(0x0e11, 0x008a, "AD1885", 41000),
         SND_PCI_QUIRK(0x1028, 0x00be, "AD1885", 44100),
         SND_PCI_QUIRK(0x1028, 0x0177, "AD1980", 48000),
+        SND_PCI_QUIRK(0x1028, 0x01ad, "AD1981B", 48000),
         SND_PCI_QUIRK(0x1043, 0x80f3, "AD1985", 48000),
         { }     /* terminator */
 };
diff --git a/sound/pci/mixart/mixart.c b/sound/pci/mixart/mixart.c
index 2d0dce649a64..ae7601f353a7 100644
--- a/sound/pci/mixart/mixart.c
+++ b/sound/pci/mixart/mixart.c
@@ -1314,8 +1314,7 @@ static int __devinit snd_mixart_probe(struct pci_dev *pci,
         }
         for (i = 0; i < 2; i++) {
                 mgr->mem[i].phys = pci_resource_start(pci, i);
-                mgr->mem[i].virt = ioremap_nocache(mgr->mem[i].phys,
-                                                   pci_resource_len(pci, i));
+                mgr->mem[i].virt = pci_ioremap_bar(pci, i);
                 if (!mgr->mem[i].virt) {
                         printk(KERN_ERR "unable to remap resource 0x%lx\n",
                                mgr->mem[i].phys);