12 files changed, 86 insertions, 17 deletions

diff --git a/sound/core/control.c b/sound/core/control.c
index 6d71f9a7ccbb..b0bf42691047 100644
--- a/sound/core/control.c
+++ b/sound/core/control.c
@@ -225,8 +225,13 @@ struct snd_kcontrol *snd_ctl_new1(const struct snd_kcontrol_new *ncontrol,
         kctl.id.iface = ncontrol->iface;
         kctl.id.device = ncontrol->device;
         kctl.id.subdevice = ncontrol->subdevice;
-        if (ncontrol->name)
+        if (ncontrol->name) {
                 strlcpy(kctl.id.name, ncontrol->name, sizeof(kctl.id.name));
+                if (strcmp(ncontrol->name, kctl.id.name) != 0)
+                        snd_printk(KERN_WARNING
+                                   "Control name '%s' truncated to '%s'\n",
+                                   ncontrol->name, kctl.id.name);
+        }
         kctl.id.index = ncontrol->index;
         kctl.count = ncontrol->count ? ncontrol->count : 1;
         access = ncontrol->access == 0 ? SNDRV_CTL_ELEM_ACCESS_READWRITE :
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/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 f080f8ce0ecb..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++)
@@ -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_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/soc/codecs/wm9713.c b/sound/soc/codecs/wm9713.c
index aba402b3c999..945b32ed9884 100644
--- a/sound/soc/codecs/wm9713.c
+++ b/sound/soc/codecs/wm9713.c
@@ -140,7 +140,7 @@ SOC_SINGLE("Capture ADC Boost (+20dB) Switch", AC97_VIDEO, 6, 1, 0),
 
 SOC_SINGLE("ALC Target Volume", AC97_CODEC_CLASS_REV, 12, 15, 0),
 SOC_SINGLE("ALC Hold Time", AC97_CODEC_CLASS_REV, 8, 15, 0),
-SOC_SINGLE("ALC Decay Time ", AC97_CODEC_CLASS_REV, 4, 15, 0),
+SOC_SINGLE("ALC Decay Time", AC97_CODEC_CLASS_REV, 4, 15, 0),
 SOC_SINGLE("ALC Attack Time", AC97_CODEC_CLASS_REV, 0, 15, 0),
 SOC_ENUM("ALC Function", wm9713_enum[6]),
 SOC_SINGLE("ALC Max Volume", AC97_PCI_SVID, 11, 7, 0),
diff --git a/sound/soc/fsl/mpc5200_psc_i2s.c b/sound/soc/fsl/mpc5200_psc_i2s.c
index 86923299bc10..94a02eaa4825 100644
--- a/sound/soc/fsl/mpc5200_psc_i2s.c
+++ b/sound/soc/fsl/mpc5200_psc_i2s.c
@@ -277,7 +277,7 @@ static int psc_i2s_trigger(struct snd_pcm_substream *substream, int cmd)
         struct mpc52xx_psc __iomem *regs = psc_i2s->psc_regs;
         u16 imr;
         u8 psc_cmd;
-        long flags;
+        unsigned long flags;
 
         if (substream->pstr->stream == SNDRV_PCM_STREAM_CAPTURE)
                 s = &psc_i2s->capture;
@@ -699,9 +699,11 @@ static ssize_t psc_i2s_stat_store(struct device *dev,
         return count;
 }
 
-DEVICE_ATTR(status, 0644, psc_i2s_status_show, NULL);
-DEVICE_ATTR(playback_underrun, 0644, psc_i2s_stat_show, psc_i2s_stat_store);
-DEVICE_ATTR(capture_overrun, 0644, psc_i2s_stat_show, psc_i2s_stat_store);
+static DEVICE_ATTR(status, 0644, psc_i2s_status_show, NULL);
+static DEVICE_ATTR(playback_underrun, 0644, psc_i2s_stat_show,
+                        psc_i2s_stat_store);
+static DEVICE_ATTR(capture_overrun, 0644, psc_i2s_stat_show,
+                        psc_i2s_stat_store);
 
 /* ---------------------------------------------------------------------
  * OF platform bus binding code:
@@ -819,8 +821,8 @@ static int __devinit psc_i2s_of_probe(struct of_device *op,
 
         /* Register the SYSFS files */
         rc = device_create_file(psc_i2s->dev, &dev_attr_status);
-        rc = device_create_file(psc_i2s->dev, &dev_attr_capture_overrun);
-        rc = device_create_file(psc_i2s->dev, &dev_attr_playback_underrun);
+        rc |= device_create_file(psc_i2s->dev, &dev_attr_capture_overrun);
+        rc |= device_create_file(psc_i2s->dev, &dev_attr_playback_underrun);
         if (rc)
                 dev_info(psc_i2s->dev, "error creating sysfs files\n");
 
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 462e635dfc74..a3adbf06b1e5 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -1462,7 +1462,7 @@ int snd_soc_info_volsw(struct snd_kcontrol *kcontrol,
         struct soc_mixer_control *mc =
                 (struct soc_mixer_control *)kcontrol->private_value;
         int max = mc->max;
-        unsigned int shift = mc->min;
+        unsigned int shift = mc->shift;
         unsigned int rshift = mc->rshift;
 
         if (max == 1)
diff --git a/sound/usb/usbquirks.h b/sound/usb/usbquirks.h
index 69689e79bf79..92115755d98e 100644
--- a/sound/usb/usbquirks.h
+++ b/sound/usb/usbquirks.h
@@ -1480,6 +1480,36 @@ YAMAHA_DEVICE(0x7010, "UB99"),
                 }
         }
 },
+{
+        /* Advanced modes of the Edirol UA-25EX.
+         * For the standard mode, UA-25EX has ID 0582:00e7, which
+         * offers only 16-bit PCM at 44.1 kHz and no MIDI.
+         */
+        USB_DEVICE_VENDOR_SPEC(0x0582, 0x00e6),
+        .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
+                .vendor_name = "EDIROL",
+                .product_name = "UA-25EX",
+                .ifnum = QUIRK_ANY_INTERFACE,
+                .type = QUIRK_COMPOSITE,
+                .data = (const struct snd_usb_audio_quirk[]) {
+                        {
+                                .ifnum = 0,
+                                .type = QUIRK_AUDIO_EDIROL_UAXX
+                        },
+                        {
+                                .ifnum = 1,
+                                .type = QUIRK_AUDIO_EDIROL_UAXX
+                        },
+                        {
+                                .ifnum = 2,
+                                .type = QUIRK_AUDIO_EDIROL_UAXX
+                        },
+                        {
+                                .ifnum = -1
+                        }
+                }
+        }
+},
 
 /* Guillemot devices */
 {