14 files changed, 60 insertions, 25 deletions

diff --git a/sound/arm/pxa2xx-pcm-lib.c b/sound/arm/pxa2xx-pcm-lib.c
index 743ac6a29065..fd51fa8b06a1 100644
--- a/sound/arm/pxa2xx-pcm-lib.c
+++ b/sound/arm/pxa2xx-pcm-lib.c
@@ -205,6 +205,7 @@ int __pxa2xx_pcm_open(struct snd_pcm_substream *substream)
         if (!rtd->dma_desc_array)
                 goto err1;
 
+        rtd->dma_ch = -1;
         runtime->private_data = rtd;
         return 0;
 
diff --git a/sound/core/pcm_lib.c b/sound/core/pcm_lib.c
index b546ac2660f9..a2ff86189d2a 100644
--- a/sound/core/pcm_lib.c
+++ b/sound/core/pcm_lib.c
@@ -148,6 +148,9 @@ static void pcm_debug_name(struct snd_pcm_substream *substream,
 
 #define xrun_debug(substream, mask) \
                         ((substream)->pstr->xrun_debug & (mask))
+#else
+#define xrun_debug(substream, mask)     0
+#endif
 
 #define dump_stack_on_xrun(substream) do {                      \
                 if (xrun_debug(substream, XRUN_DEBUG_STACK))    \
@@ -169,6 +172,7 @@ static void xrun(struct snd_pcm_substream *substream)
         }
 }
 
+#ifdef CONFIG_SND_PCM_XRUN_DEBUG
 #define hw_ptr_error(substream, fmt, args...)                           \
         do {                                                            \
                 if (xrun_debug(substream, XRUN_DEBUG_BASIC)) {          \
@@ -255,8 +259,6 @@ static void xrun_log_show(struct snd_pcm_substream *substream)
 
 #else /* ! CONFIG_SND_PCM_XRUN_DEBUG */
 
-#define xrun_debug(substream, mask)     0
-#define xrun(substream)                 do { } while (0)
 #define hw_ptr_error(substream, fmt, args...) do { } while (0)
 #define xrun_log(substream, pos)        do { } while (0)
 #define xrun_log_show(substream)        do { } while (0)
diff --git a/sound/oss/vidc.c b/sound/oss/vidc.c
index 725fef0f59a3..a4127bab9231 100644
--- a/sound/oss/vidc.c
+++ b/sound/oss/vidc.c
@@ -363,13 +363,13 @@ static void vidc_audio_trigger(int dev, int enable_bits)
         struct audio_operations *adev = audio_devs[dev];
 
         if (enable_bits & PCM_ENABLE_OUTPUT) {
-                if (!(adev->flags & DMA_ACTIVE)) {
+                if (!(adev->dmap_out->flags & DMA_ACTIVE)) {
                         unsigned long flags;
 
                         local_irq_save(flags);
 
                         /* prevent recusion */
-                        adev->flags |= DMA_ACTIVE;
+                        adev->dmap_out->flags |= DMA_ACTIVE;
 
                         dma_interrupt = vidc_audio_dma_interrupt;
                         vidc_sound_dma_irq(0, NULL);
diff --git a/sound/pci/ac97/ac97_patch.c b/sound/pci/ac97/ac97_patch.c
index 1caf5e3c1f6a..e68c98ef4041 100644
--- a/sound/pci/ac97/ac97_patch.c
+++ b/sound/pci/ac97/ac97_patch.c
@@ -1852,12 +1852,14 @@ static unsigned int ad1981_jacks_blacklist[] = {
         0x10140523, /* Thinkpad R40 */
         0x10140534, /* Thinkpad X31 */
         0x10140537, /* Thinkpad T41p */
+        0x1014053e, /* Thinkpad R40e */
         0x10140554, /* Thinkpad T42p/R50p */
         0x10140567, /* Thinkpad T43p 2668-G7U */
         0x10140581, /* Thinkpad X41-2527 */
         0x10280160, /* Dell Dimension 2400 */
         0x104380b0, /* Asus A7V8X-MX */
         0x11790241, /* Toshiba Satellite A-15 S127 */
+        0x1179ff10, /* Toshiba P500 */
         0x144dc01a, /* Samsung NP-X20C004/SEG */
         0 /* end */
 };
diff --git a/sound/pci/cmipci.c b/sound/pci/cmipci.c
index 1ded64e05643..329968edca9b 100644
--- a/sound/pci/cmipci.c
+++ b/sound/pci/cmipci.c
@@ -941,13 +941,21 @@ static snd_pcm_uframes_t snd_cmipci_pcm_pointer(struct cmipci *cm, struct cmipci
                                                 struct snd_pcm_substream *substream)
 {
         size_t ptr;
-        unsigned int reg;
+        unsigned int reg, rem, tries;
+
         if (!rec->running)
                 return 0;
 #if 1 // this seems better..
         reg = rec->ch ? CM_REG_CH1_FRAME2 : CM_REG_CH0_FRAME2;
-        ptr = rec->dma_size - (snd_cmipci_read_w(cm, reg) + 1);
-        ptr >>= rec->shift;
+        for (tries = 0; tries < 3; tries++) {
+                rem = snd_cmipci_read_w(cm, reg);
+                if (rem < rec->dma_size)
+                        goto ok;
+        } 
+        printk(KERN_ERR "cmipci: invalid PCM pointer: %#x\n", rem);
+        return SNDRV_PCM_POS_XRUN;
+ok:
+        ptr = (rec->dma_size - (rem + 1)) >> rec->shift;
 #else
         reg = rec->ch ? CM_REG_CH1_FRAME1 : CM_REG_CH0_FRAME1;
         ptr = snd_cmipci_read(cm, reg) - rec->offset;
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
index 8b2915631cc3..4bb90675f70f 100644
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@ -2269,6 +2269,7 @@ static struct snd_pci_quirk position_fix_list[] __devinitdata = {
         SND_PCI_QUIRK(0x103c, 0x306d, "HP dv3", POS_FIX_LPIB),
         SND_PCI_QUIRK(0x1106, 0x3288, "ASUS M2V-MX SE", POS_FIX_LPIB),
         SND_PCI_QUIRK(0x1043, 0x813d, "ASUS P5AD2", POS_FIX_LPIB),
+        SND_PCI_QUIRK(0x1458, 0xa022, "ga-ma770-ud3", POS_FIX_LPIB),
         SND_PCI_QUIRK(0x1462, 0x1002, "MSI Wind U115", POS_FIX_LPIB),
         SND_PCI_QUIRK(0x1565, 0x820f, "Biostar Microtech", POS_FIX_LPIB),
         SND_PCI_QUIRK(0x8086, 0xd601, "eMachines T5212", POS_FIX_LPIB),
diff --git a/sound/pci/hda/patch_conexant.c b/sound/pci/hda/patch_conexant.c
index 194a28c54992..61682e1d09da 100644
--- a/sound/pci/hda/patch_conexant.c
+++ b/sound/pci/hda/patch_conexant.c
@@ -1591,6 +1591,21 @@ static int patch_cxt5047(struct hda_codec *codec)
 #endif  
         }
         spec->vmaster_nid = 0x13;
+
+        switch (codec->subsystem_id >> 16) {
+        case 0x103c:
+                /* HP laptops have really bad sound over 0 dB on NID 0x10.
+                 * Fix max PCM level to 0 dB (originally it has 0x1e steps
+                 * with 0 dB offset 0x17)
+                 */
+                snd_hda_override_amp_caps(codec, 0x10, HDA_INPUT,
+                                          (0x17 << AC_AMPCAP_OFFSET_SHIFT) |
+                                          (0x17 << AC_AMPCAP_NUM_STEPS_SHIFT) |
+                                          (0x05 << AC_AMPCAP_STEP_SIZE_SHIFT) |
+                                          (1 << AC_AMPCAP_MUTE_SHIFT));
+                break;
+        }
+
         return 0;
 }
 
diff --git a/sound/pci/hda/patch_nvhdmi.c b/sound/pci/hda/patch_nvhdmi.c
index 70669a246902..3c10c0b149f4 100644
--- a/sound/pci/hda/patch_nvhdmi.c
+++ b/sound/pci/hda/patch_nvhdmi.c
@@ -538,8 +538,6 @@ static int patch_nvhdmi_2ch(struct hda_codec *codec)
  * patch entries
  */
 static struct hda_codec_preset snd_hda_preset_nvhdmi[] = {
-        { .id = 0x10de0067, .name = "MCP67 HDMI", .patch = patch_nvhdmi_2ch },
-        { .id = 0x10de8001, .name = "MCP73 HDMI", .patch = patch_nvhdmi_2ch },
         { .id = 0x10de0002, .name = "MCP77/78 HDMI",
           .patch = patch_nvhdmi_8ch_7x },
         { .id = 0x10de0003, .name = "MCP77/78 HDMI",
@@ -550,12 +548,16 @@ static struct hda_codec_preset snd_hda_preset_nvhdmi[] = {
           .patch = patch_nvhdmi_8ch_7x },
         { .id = 0x10de0007, .name = "MCP79/7A HDMI",
           .patch = patch_nvhdmi_8ch_7x },
-        { .id = 0x10de000c, .name = "MCP89 HDMI",
+        { .id = 0x10de000a, .name = "GT220 HDMI",
           .patch = patch_nvhdmi_8ch_89 },
         { .id = 0x10de000b, .name = "GT21x HDMI",
           .patch = patch_nvhdmi_8ch_89 },
+        { .id = 0x10de000c, .name = "MCP89 HDMI",
+          .patch = patch_nvhdmi_8ch_89 },
         { .id = 0x10de000d, .name = "GT240 HDMI",
           .patch = patch_nvhdmi_8ch_89 },
+        { .id = 0x10de0067, .name = "MCP67 HDMI", .patch = patch_nvhdmi_2ch },
+        { .id = 0x10de8001, .name = "MCP73 HDMI", .patch = patch_nvhdmi_2ch },
         {} /* terminator */
 };
 
@@ -564,11 +566,12 @@ MODULE_ALIAS("snd-hda-codec-id:10de0003");
 MODULE_ALIAS("snd-hda-codec-id:10de0005");
 MODULE_ALIAS("snd-hda-codec-id:10de0006");
 MODULE_ALIAS("snd-hda-codec-id:10de0007");
-MODULE_ALIAS("snd-hda-codec-id:10de0067");
-MODULE_ALIAS("snd-hda-codec-id:10de8001");
-MODULE_ALIAS("snd-hda-codec-id:10de000c");
+MODULE_ALIAS("snd-hda-codec-id:10de000a");
 MODULE_ALIAS("snd-hda-codec-id:10de000b");
+MODULE_ALIAS("snd-hda-codec-id:10de000c");
 MODULE_ALIAS("snd-hda-codec-id:10de000d");
+MODULE_ALIAS("snd-hda-codec-id:10de0067");
+MODULE_ALIAS("snd-hda-codec-id:10de8001");
 
 MODULE_LICENSE("GPL");
 MODULE_DESCRIPTION("NVIDIA HDMI HD-audio codec");
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index 4ec57633af88..9a23444e9e7a 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -2532,8 +2532,6 @@ static int alc_build_controls(struct hda_codec *codec)
                         return err;
         }
 
-        alc_free_kctls(codec); /* no longer needed */
-
         /* assign Capture Source enums to NID */
         kctl = snd_hda_find_mixer_ctl(codec, "Capture Source");
         if (!kctl)
@@ -2602,6 +2600,9 @@ static int alc_build_controls(struct hda_codec *codec)
                         }
                 }
         }
+
+        alc_free_kctls(codec); /* no longer needed */
+
         return 0;
 }
 
@@ -10042,8 +10043,11 @@ static void alc882_auto_set_output_and_unmute(struct hda_codec *codec,
         alc_set_pin_output(codec, nid, pin_type);
         if (spec->multiout.dac_nids[dac_idx] == 0x25)
                 idx = 4;
-        else
+        else {
+                if (spec->multiout.num_dacs >= dac_idx)
+                        return;
                 idx = spec->multiout.dac_nids[dac_idx] - 2;
+        }
         snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_CONNECT_SEL, idx);
 
 }
diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c
index 8c416bb18a57..c4be3fab94e5 100644
--- a/sound/pci/hda/patch_sigmatel.c
+++ b/sound/pci/hda/patch_sigmatel.c
@@ -1730,6 +1730,8 @@ static struct snd_pci_quirk stac92hd71bxx_cfg_tbl[] = {
                       "HP HDX", STAC_HP_HDX),  /* HDX16 */
         SND_PCI_QUIRK_MASK(PCI_VENDOR_ID_HP, 0xfff0, 0x3620,
                       "HP dv6", STAC_HP_DV5),
+        SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x3061,
+                      "HP dv6", STAC_HP_DV5), /* HP dv6-1110ax */
         SND_PCI_QUIRK_MASK(PCI_VENDOR_ID_HP, 0xfff0, 0x7010,
                       "HP", STAC_HP_DV5),
         SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x0233,
diff --git a/sound/soc/codecs/tlv320dac33.c b/sound/soc/codecs/tlv320dac33.c
index f9f367d29a90..d50f1699ccb2 100644
--- a/sound/soc/codecs/tlv320dac33.c
+++ b/sound/soc/codecs/tlv320dac33.c
@@ -778,7 +778,7 @@ static int dac33_prepare_chip(struct snd_pcm_substream *substream)
         if (dac33->fifo_mode) {
                 /* Generic for all FIFO modes */
                 /* 50-51 : ASRC Control registers */
-                dac33_write(codec, DAC33_ASRC_CTRL_A, (1 << 4)); /* div=2 */
+                dac33_write(codec, DAC33_ASRC_CTRL_A, DAC33_SRCLKDIV(1));
                 dac33_write(codec, DAC33_ASRC_CTRL_B, 1); /* ??? */
 
                 /* Write registers 0x34 and 0x35 (MSB, LSB) */
@@ -1038,11 +1038,7 @@ static int dac33_set_dai_fmt(struct snd_soc_dai *codec_dai,
         case SND_SOC_DAIFMT_DSP_A:
                 aictrl_a |= DAC33_AFMT_DSP;
                 aictrl_b &= ~DAC33_DATA_DELAY_MASK;
-                aictrl_b |= DAC33_DATA_DELAY(1); /* 1 bit delay */
-                break;
-        case SND_SOC_DAIFMT_DSP_B:
-                aictrl_a |= DAC33_AFMT_DSP;
-                aictrl_b &= ~DAC33_DATA_DELAY_MASK; /* No delay */
+                aictrl_b |= DAC33_DATA_DELAY(0);
                 break;
         case SND_SOC_DAIFMT_RIGHT_J:
                 aictrl_a |= DAC33_AFMT_RIGHT_J;
@@ -1066,7 +1062,7 @@ static void dac33_init_chip(struct snd_soc_codec *codec)
 {
         /* 44-46: DAC Control Registers */
         /* A : DAC sample rate Fsref/1.5 */
-        dac33_write(codec, DAC33_DAC_CTRL_A, DAC33_DACRATE(1));
+        dac33_write(codec, DAC33_DAC_CTRL_A, DAC33_DACRATE(0));
         /* B : DAC src=normal, not muted */
         dac33_write(codec, DAC33_DAC_CTRL_B, DAC33_DACSRCR_RIGHT |
                                              DAC33_DACSRCL_LEFT);
diff --git a/sound/soc/codecs/wm_hubs.c b/sound/soc/codecs/wm_hubs.c
index 0ad9f5d536c6..486bdd21a98a 100644
--- a/sound/soc/codecs/wm_hubs.c
+++ b/sound/soc/codecs/wm_hubs.c
@@ -74,7 +74,7 @@ static void wait_for_dc_servo(struct snd_soc_codec *codec)
                 msleep(1);
                 reg = snd_soc_read(codec, WM8993_DC_SERVO_READBACK_0);
                 dev_dbg(codec->dev, "DC servo: %x\n", reg);
-        } while (reg & WM8993_DCS_DATAPATH_BUSY);
+        } while (reg & WM8993_DCS_DATAPATH_BUSY && count < 400);
 
         if (reg & WM8993_DCS_DATAPATH_BUSY)
                 dev_err(codec->dev, "Timed out waiting for DC Servo\n");
diff --git a/sound/soc/imx/Kconfig b/sound/soc/imx/Kconfig
index c7d0fd9b7de8..7174b4c710de 100644
--- a/sound/soc/imx/Kconfig
+++ b/sound/soc/imx/Kconfig
@@ -1,6 +1,6 @@
 config SND_IMX_SOC
         tristate "SoC Audio for Freescale i.MX CPUs"
-        depends on ARCH_MXC && BROKEN
+        depends on ARCH_MXC
         select SND_PCM
         select FIQ
         select SND_SOC_AC97_BUS
diff --git a/sound/soc/sh/Kconfig b/sound/soc/sh/Kconfig
index 106674979b53..f07f6d8b93e1 100644
--- a/sound/soc/sh/Kconfig
+++ b/sound/soc/sh/Kconfig
@@ -32,6 +32,7 @@ config SND_SOC_SH4_SIU
         select DMA_ENGINE
         select DMADEVICES
         select SH_DMAE
+        select FW_LOADER
 
 ##
 ## Boards