Merge tag 'sound-3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound

Pull sound fixes from Takashi Iwai:
 "Except for a slightly big OMAP changes, all rest are small, mostly
  boring changes; all either 3.11 regression fixes or stable materials.

   - ASoC OMAP fixes due to non-DT OMAP4 removals
   - Other ASoC driver changes (sglt5000, wm8978, wm8948, samsung)
   - Fix missing locking for snd_pcm_stop() calls in many drivers
   - Fix the blocking request_module() in OSS sequencer
   - Fix old OSS vwsnd driver builds
   - Add a new HD-audio HDMI codec ID"

* tag 'sound-3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (23 commits)
  ALSA: seq-oss: Initialize MIDI clients asynchronously
  ALSA: hda - Add new GPU codec ID to snd-hda
  staging: line6: Fix unlocked snd_pcm_stop() call
  [media] saa7134: Fix unlocked snd_pcm_stop() call
  ASoC: s6000: Fix unlocked snd_pcm_stop() call
  ASoC: atmel: Fix unlocked snd_pcm_stop() call
  ALSA: pxa2xx: Fix unlocked snd_pcm_stop() call
  ALSA: usx2y: Fix unlocked snd_pcm_stop() call
  ALSA: ua101: Fix unlocked snd_pcm_stop() call
  ALSA: 6fire: Fix unlocked snd_pcm_stop() call
  ALSA: atiixp: Fix unlocked snd_pcm_stop() call
  ALSA: asihpi: Fix unlocked snd_pcm_stop() call
  sound: oss/vwsnd: Always define vwsnd_mutex
  sound: oss/vwsnd: Add missing inclusion of linux/delay.h
  ASoC: wm8978: enable symmetric rates
  ASoC: omap-mcbsp: Use different method for DMA request when booted with DT
  ASoC: omap-dmic: Do not use platform_get_resource_byname() for DMA
  ASoC: omap-mcpdm: Do not use platform_get_resource_byname() for DMA
  ASoC: omap-pcm: Request the DMA channel differently when DT is involved
  ASoC: Samsung: Set RFS and BFS in slave mode
  ...

24 files changed, 110 insertions, 64 deletions

diff --git a/drivers/media/pci/saa7134/saa7134-alsa.c b/drivers/media/pci/saa7134/saa7134-alsa.c
index 10460fd3ce39..dbcdfbf8aed0 100644
--- a/drivers/media/pci/saa7134/saa7134-alsa.c
+++ b/drivers/media/pci/saa7134/saa7134-alsa.c
@@ -172,7 +172,9 @@ static void saa7134_irq_alsa_done(struct saa7134_dev *dev,
                 dprintk("irq: overrun [full=%d/%d] - Blocks in %d\n",dev->dmasound.read_count,
                         dev->dmasound.bufsize, dev->dmasound.blocks);
                 spin_unlock(&dev->slock);
+                snd_pcm_stream_lock(dev->dmasound.substream);
                 snd_pcm_stop(dev->dmasound.substream,SNDRV_PCM_STATE_XRUN);
+                snd_pcm_stream_unlock(dev->dmasound.substream);
                 return;
         }
 
diff --git a/drivers/staging/line6/pcm.c b/drivers/staging/line6/pcm.c
index 4795f1284906..0dd08ef51398 100644
--- a/drivers/staging/line6/pcm.c
+++ b/drivers/staging/line6/pcm.c
@@ -392,8 +392,11 @@ static int snd_line6_pcm_free(struct snd_device *device)
 */
 static void pcm_disconnect_substream(struct snd_pcm_substream *substream)
 {
-        if (substream->runtime && snd_pcm_running(substream))
+        if (substream->runtime && snd_pcm_running(substream)) {
+                snd_pcm_stream_lock_irq(substream);
                 snd_pcm_stop(substream, SNDRV_PCM_STATE_DISCONNECTED);
+                snd_pcm_stream_unlock_irq(substream);
+        }
 }
 
 /*
diff --git a/sound/arm/pxa2xx-pcm-lib.c b/sound/arm/pxa2xx-pcm-lib.c
index 76e0d5695075..823359ed95e1 100644
--- a/sound/arm/pxa2xx-pcm-lib.c
+++ b/sound/arm/pxa2xx-pcm-lib.c
@@ -166,7 +166,9 @@ void pxa2xx_pcm_dma_irq(int dma_ch, void *dev_id)
         } else {
                 printk(KERN_ERR "%s: DMA error on channel %d (DCSR=%#x)\n",
                         rtd->params->name, dma_ch, dcsr);
+                snd_pcm_stream_lock(substream);
                 snd_pcm_stop(substream, SNDRV_PCM_STATE_XRUN);
+                snd_pcm_stream_unlock(substream);
         }
 }
 EXPORT_SYMBOL(pxa2xx_pcm_dma_irq);
diff --git a/sound/core/seq/oss/seq_oss_init.c b/sound/core/seq/oss/seq_oss_init.c
index e3cb46fef2c7..b3f39b5ed742 100644
--- a/sound/core/seq/oss/seq_oss_init.c
+++ b/sound/core/seq/oss/seq_oss_init.c
@@ -31,6 +31,7 @@
 #include <linux/export.h>
 #include <linux/moduleparam.h>
 #include <linux/slab.h>
+#include <linux/workqueue.h>
 
 /*
  * common variables
@@ -60,6 +61,14 @@ static void free_devinfo(void *private);
 #define call_ctl(type,rec) snd_seq_kernel_client_ctl(system_client, type, rec)
 
 
+/* call snd_seq_oss_midi_lookup_ports() asynchronously */
+static void async_call_lookup_ports(struct work_struct *work)
+{
+        snd_seq_oss_midi_lookup_ports(system_client);
+}
+
+static DECLARE_WORK(async_lookup_work, async_call_lookup_ports);
+
 /*
  * create sequencer client for OSS sequencer
  */
@@ -85,9 +94,6 @@ snd_seq_oss_create_client(void)
         system_client = rc;
         debug_printk(("new client = %d\n", rc));
 
-        /* look up midi devices */
-        snd_seq_oss_midi_lookup_ports(system_client);
-
         /* create annoucement receiver port */
         memset(port, 0, sizeof(*port));
         strcpy(port->name, "Receiver");
@@ -115,6 +121,9 @@ snd_seq_oss_create_client(void)
         }
         rc = 0;
 
+        /* look up midi devices */
+        schedule_work(&async_lookup_work);
+
  __error:
         kfree(port);
         return rc;
@@ -160,6 +169,7 @@ receive_announce(struct snd_seq_event *ev, int direct, void *private, int atomic
 int
 snd_seq_oss_delete_client(void)
 {
+        cancel_work_sync(&async_lookup_work);
         if (system_client >= 0)
                 snd_seq_delete_kernel_client(system_client);
 
diff --git a/sound/core/seq/oss/seq_oss_midi.c b/sound/core/seq/oss/seq_oss_midi.c
index 677dc84590c7..862d84893ee8 100644
--- a/sound/core/seq/oss/seq_oss_midi.c
+++ b/sound/core/seq/oss/seq_oss_midi.c
@@ -72,7 +72,7 @@ static int send_midi_event(struct seq_oss_devinfo *dp, struct snd_seq_event *ev,
  * look up the existing ports
  * this looks a very exhausting job.
  */
-int __init
+int
 snd_seq_oss_midi_lookup_ports(int client)
 {
         struct snd_seq_client_info *clinfo;
diff --git a/sound/oss/vwsnd.c b/sound/oss/vwsnd.c
index 7e814a5c3677..4bbcc0fcd4eb 100644
--- a/sound/oss/vwsnd.c
+++ b/sound/oss/vwsnd.c
@@ -149,17 +149,19 @@
 #include <linux/interrupt.h>
 #include <linux/mutex.h>
 #include <linux/slab.h>
+#include <linux/delay.h>
 
 #include <asm/visws/cobalt.h>
 
 #include "sound_config.h"
 
+static DEFINE_MUTEX(vwsnd_mutex);
+
 /*****************************************************************************/
 /* debug stuff */
 
 #ifdef VWSND_DEBUG
 
-static DEFINE_MUTEX(vwsnd_mutex);
 static int shut_up = 1;
 
 /*
diff --git a/sound/pci/asihpi/asihpi.c b/sound/pci/asihpi/asihpi.c
index 185d54a5cb1a..dc632cdc3870 100644
--- a/sound/pci/asihpi/asihpi.c
+++ b/sound/pci/asihpi/asihpi.c
@@ -769,7 +769,10 @@ static void snd_card_asihpi_timer_function(unsigned long data)
                                                 s->number);
                                 ds->drained_count++;
                                 if (ds->drained_count > 20) {
+                                        unsigned long flags;
+                                        snd_pcm_stream_lock_irqsave(s, flags);
                                         snd_pcm_stop(s, SNDRV_PCM_STATE_XRUN);
+                                        snd_pcm_stream_unlock_irqrestore(s, flags);
                                         continue;
                                 }
                         } else {
diff --git a/sound/pci/atiixp.c b/sound/pci/atiixp.c
index fe4c61bdb8ba..f6dec3ea371f 100644
--- a/sound/pci/atiixp.c
+++ b/sound/pci/atiixp.c
@@ -689,7 +689,9 @@ static void snd_atiixp_xrun_dma(struct atiixp *chip, struct atiixp_dma *dma)
         if (! dma->substream || ! dma->running)
                 return;
         snd_printdd("atiixp: XRUN detected (DMA %d)\n", dma->ops->type);
+        snd_pcm_stream_lock(dma->substream);
         snd_pcm_stop(dma->substream, SNDRV_PCM_STATE_XRUN);
+        snd_pcm_stream_unlock(dma->substream);
 }
 
 /*
diff --git a/sound/pci/atiixp_modem.c b/sound/pci/atiixp_modem.c
index cf29b9a1d65d..289563ecb6dd 100644
--- a/sound/pci/atiixp_modem.c
+++ b/sound/pci/atiixp_modem.c
@@ -638,7 +638,9 @@ static void snd_atiixp_xrun_dma(struct atiixp_modem *chip,
         if (! dma->substream || ! dma->running)
                 return;
         snd_printdd("atiixp-modem: XRUN detected (DMA %d)\n", dma->ops->type);
+        snd_pcm_stream_lock(dma->substream);
         snd_pcm_stop(dma->substream, SNDRV_PCM_STATE_XRUN);
+        snd_pcm_stream_unlock(dma->substream);
 }
 
 /*
diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c
index 540bdef2f904..030ca8652a1c 100644
--- a/sound/pci/hda/patch_hdmi.c
+++ b/sound/pci/hda/patch_hdmi.c
@@ -2622,6 +2622,7 @@ static const struct hda_codec_preset snd_hda_preset_hdmi[] = {
 { .id = 0x10de0043, .name = "GPU 43 HDMI/DP",   .patch = patch_generic_hdmi },
 { .id = 0x10de0044, .name = "GPU 44 HDMI/DP",   .patch = patch_generic_hdmi },
 { .id = 0x10de0051, .name = "GPU 51 HDMI/DP",   .patch = patch_generic_hdmi },
+{ .id = 0x10de0060, .name = "GPU 60 HDMI/DP",   .patch = patch_generic_hdmi },
 { .id = 0x10de0067, .name = "MCP67 HDMI",       .patch = patch_nvhdmi_2ch },
 { .id = 0x10de8001, .name = "MCP73 HDMI",       .patch = patch_nvhdmi_2ch },
 { .id = 0x11069f80, .name = "VX900 HDMI/DP",    .patch = patch_via_hdmi },
@@ -2674,6 +2675,7 @@ MODULE_ALIAS("snd-hda-codec-id:10de0042");
 MODULE_ALIAS("snd-hda-codec-id:10de0043");
 MODULE_ALIAS("snd-hda-codec-id:10de0044");
 MODULE_ALIAS("snd-hda-codec-id:10de0051");
+MODULE_ALIAS("snd-hda-codec-id:10de0060");
 MODULE_ALIAS("snd-hda-codec-id:10de0067");
 MODULE_ALIAS("snd-hda-codec-id:10de8001");
 MODULE_ALIAS("snd-hda-codec-id:11069f80");
diff --git a/sound/soc/atmel/atmel-pcm-dma.c b/sound/soc/atmel/atmel-pcm-dma.c
index 1d38fd0bc4e2..d12826526798 100644
--- a/sound/soc/atmel/atmel-pcm-dma.c
+++ b/sound/soc/atmel/atmel-pcm-dma.c
@@ -81,7 +81,9 @@ static void atmel_pcm_dma_irq(u32 ssc_sr,
 
                 /* stop RX and capture: will be enabled again at restart */
                 ssc_writex(prtd->ssc->regs, SSC_CR, prtd->mask->ssc_disable);
+                snd_pcm_stream_lock(substream);
                 snd_pcm_stop(substream, SNDRV_PCM_STATE_XRUN);
+                snd_pcm_stream_unlock(substream);
 
                 /* now drain RHR and read status to remove xrun condition */
                 ssc_readx(prtd->ssc->regs, SSC_RHR);
diff --git a/sound/soc/codecs/sgtl5000.c b/sound/soc/codecs/sgtl5000.c
index d441559dc92c..d659d3adcfb3 100644
--- a/sound/soc/codecs/sgtl5000.c
+++ b/sound/soc/codecs/sgtl5000.c
@@ -38,7 +38,7 @@
 static const struct reg_default sgtl5000_reg_defaults[] = {
         { SGTL5000_CHIP_CLK_CTRL,               0x0008 },
         { SGTL5000_CHIP_I2S_CTRL,               0x0010 },
-        { SGTL5000_CHIP_SSS_CTRL,               0x0008 },
+        { SGTL5000_CHIP_SSS_CTRL,               0x0010 },
         { SGTL5000_CHIP_DAC_VOL,                0x3c3c },
         { SGTL5000_CHIP_PAD_STRENGTH,           0x015f },
         { SGTL5000_CHIP_ANA_HP_CTRL,            0x1818 },
diff --git a/sound/soc/codecs/sgtl5000.h b/sound/soc/codecs/sgtl5000.h
index 4b69229a9818..2f8c88931f69 100644
--- a/sound/soc/codecs/sgtl5000.h
+++ b/sound/soc/codecs/sgtl5000.h
@@ -347,7 +347,7 @@
 #define SGTL5000_PLL_INT_DIV_MASK               0xf800
 #define SGTL5000_PLL_INT_DIV_SHIFT              11
 #define SGTL5000_PLL_INT_DIV_WIDTH              5
-#define SGTL5000_PLL_FRAC_DIV_MASK              0x0700
+#define SGTL5000_PLL_FRAC_DIV_MASK              0x07ff
 #define SGTL5000_PLL_FRAC_DIV_SHIFT             0
 #define SGTL5000_PLL_FRAC_DIV_WIDTH             11
 
diff --git a/sound/soc/codecs/wm8978.c b/sound/soc/codecs/wm8978.c
index 029f31c8e703..d8fc531c0e59 100644
--- a/sound/soc/codecs/wm8978.c
+++ b/sound/soc/codecs/wm8978.c
@@ -921,6 +921,7 @@ static struct snd_soc_dai_driver wm8978_dai = {
                 .formats = WM8978_FORMATS,
         },
         .ops = &wm8978_dai_ops,
+        .symmetric_rates = 1,
 };
 
 static int wm8978_suspend(struct snd_soc_codec *codec)
diff --git a/sound/soc/codecs/wm8994.c b/sound/soc/codecs/wm8994.c
index 1d4b1ec66e36..ba832b77c543 100644
--- a/sound/soc/codecs/wm8994.c
+++ b/sound/soc/codecs/wm8994.c
@@ -3852,8 +3852,6 @@ static void wm8958_mic_work(struct work_struct *work)
                                                   mic_complete_work.work);
         struct snd_soc_codec *codec = wm8994->hubs.codec;
 
-        dev_crit(codec->dev, "MIC WORK %x\n", wm8994->mic_status);
-
         pm_runtime_get_sync(codec->dev);
 
         mutex_lock(&wm8994->accdet_lock);
@@ -3863,8 +3861,6 @@ static void wm8958_mic_work(struct work_struct *work)
         mutex_unlock(&wm8994->accdet_lock);
 
         pm_runtime_put(codec->dev);
-
-        dev_crit(codec->dev, "MIC WORK %x DONE\n", wm8994->mic_status);
 }
 
 static irqreturn_t wm8958_mic_irq(int irq, void *data)
diff --git a/sound/soc/omap/mcbsp.c b/sound/soc/omap/mcbsp.c
index eb68c7db1cf3..361e4c03646e 100644
--- a/sound/soc/omap/mcbsp.c
+++ b/sound/soc/omap/mcbsp.c
@@ -1012,28 +1012,33 @@ int omap_mcbsp_init(struct platform_device *pdev)
                 }
         }
 
-        res = platform_get_resource_byname(pdev, IORESOURCE_DMA, "rx");
-        if (!res) {
-                dev_err(&pdev->dev, "invalid rx DMA channel\n");
-                return -ENODEV;
-        }
-        /* RX DMA request number, and port address configuration */
-        mcbsp->dma_req[1] = res->start;
-        mcbsp->dma_data[1].filter_data = &mcbsp->dma_req[1];
-        mcbsp->dma_data[1].addr = omap_mcbsp_dma_reg_params(mcbsp, 1);
-        mcbsp->dma_data[1].maxburst = 4;
+        if (!pdev->dev.of_node) {
+                res = platform_get_resource_byname(pdev, IORESOURCE_DMA, "tx");
+                if (!res) {
+                        dev_err(&pdev->dev, "invalid tx DMA channel\n");
+                        return -ENODEV;
+                }
+                mcbsp->dma_req[0] = res->start;
+                mcbsp->dma_data[0].filter_data = &mcbsp->dma_req[0];
 
-        res = platform_get_resource_byname(pdev, IORESOURCE_DMA, "tx");
-        if (!res) {
-                dev_err(&pdev->dev, "invalid tx DMA channel\n");
-                return -ENODEV;
+                res = platform_get_resource_byname(pdev, IORESOURCE_DMA, "rx");
+                if (!res) {
+                        dev_err(&pdev->dev, "invalid rx DMA channel\n");
+                        return -ENODEV;
+                }
+                mcbsp->dma_req[1] = res->start;
+                mcbsp->dma_data[1].filter_data = &mcbsp->dma_req[1];
+        } else {
+                mcbsp->dma_data[0].filter_data = "tx";
+                mcbsp->dma_data[1].filter_data = "rx";
         }
-        /* TX DMA request number, and port address configuration */
-        mcbsp->dma_req[0] = res->start;
-        mcbsp->dma_data[0].filter_data = &mcbsp->dma_req[0];
+
         mcbsp->dma_data[0].addr = omap_mcbsp_dma_reg_params(mcbsp, 0);
         mcbsp->dma_data[0].maxburst = 4;
 
+        mcbsp->dma_data[1].addr = omap_mcbsp_dma_reg_params(mcbsp, 1);
+        mcbsp->dma_data[1].maxburst = 4;
+
         mcbsp->fclk = clk_get(&pdev->dev, "fck");
         if (IS_ERR(mcbsp->fclk)) {
                 ret = PTR_ERR(mcbsp->fclk);
diff --git a/sound/soc/omap/omap-dmic.c b/sound/soc/omap/omap-dmic.c
index 2ad0370146fd..4db1f8e6e172 100644
--- a/sound/soc/omap/omap-dmic.c
+++ b/sound/soc/omap/omap-dmic.c
@@ -57,7 +57,6 @@ struct omap_dmic {
         struct mutex mutex;
 
         struct snd_dmaengine_dai_dma_data dma_data;
-        unsigned int dma_req;
 };
 
 static inline void omap_dmic_write(struct omap_dmic *dmic, u16 reg, u32 val)
@@ -478,15 +477,7 @@ static int asoc_dmic_probe(struct platform_device *pdev)
         }
         dmic->dma_data.addr = res->start + OMAP_DMIC_DATA_REG;
 
-        res = platform_get_resource(pdev, IORESOURCE_DMA, 0);
-        if (!res) {
-                dev_err(dmic->dev, "invalid dma resource\n");
-                ret = -ENODEV;
-                goto err_put_clk;
-        }
-
-        dmic->dma_req = res->start;
-        dmic->dma_data.filter_data = &dmic->dma_req;
+        dmic->dma_data.filter_data = "up_link";
 
         res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "mpu");
         if (!res) {
diff --git a/sound/soc/omap/omap-mcpdm.c b/sound/soc/omap/omap-mcpdm.c
index eb05c7ed6d05..a49dc52f8abc 100644
--- a/sound/soc/omap/omap-mcpdm.c
+++ b/sound/soc/omap/omap-mcpdm.c
@@ -66,7 +66,6 @@ struct omap_mcpdm {
         bool restart;
 
         struct snd_dmaengine_dai_dma_data dma_data[2];
-        unsigned int dma_req[2];
 };
 
 /*
@@ -477,19 +476,8 @@ static int asoc_mcpdm_probe(struct platform_device *pdev)
         mcpdm->dma_data[0].addr = res->start + MCPDM_REG_DN_DATA;
         mcpdm->dma_data[1].addr = res->start + MCPDM_REG_UP_DATA;
 
-        res = platform_get_resource_byname(pdev, IORESOURCE_DMA, "dn_link");
-        if (!res)
-                return -ENODEV;
-
-        mcpdm->dma_req[0] = res->start;
-        mcpdm->dma_data[0].filter_data = &mcpdm->dma_req[0];
-
-        res = platform_get_resource_byname(pdev, IORESOURCE_DMA, "up_link");
-        if (!res)
-                return -ENODEV;
-
-        mcpdm->dma_req[1] = res->start;
-        mcpdm->dma_data[1].filter_data = &mcpdm->dma_req[1];
+        mcpdm->dma_data[0].filter_data = "dn_link";
+        mcpdm->dma_data[1].filter_data = "up_link";
 
         res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "mpu");
         if (res == NULL)
diff --git a/sound/soc/omap/omap-pcm.c b/sound/soc/omap/omap-pcm.c
index c28e042f2208..a11405de86e8 100644
--- a/sound/soc/omap/omap-pcm.c
+++ b/sound/soc/omap/omap-pcm.c
@@ -113,14 +113,25 @@ static int omap_pcm_open(struct snd_pcm_substream *substream)
 {
         struct snd_soc_pcm_runtime *rtd = substream->private_data;
         struct snd_dmaengine_dai_dma_data *dma_data;
+        int ret;
 
         snd_soc_set_runtime_hwparams(substream, &omap_pcm_hardware);
 
         dma_data = snd_soc_dai_get_dma_data(rtd->cpu_dai, substream);
 
-        return snd_dmaengine_pcm_open_request_chan(substream,
-                                                   omap_dma_filter_fn,
-                                                   dma_data->filter_data);
+        /* DT boot: filter_data is the DMA name */
+        if (rtd->cpu_dai->dev->of_node) {
+                struct dma_chan *chan;
+
+                chan = dma_request_slave_channel(rtd->cpu_dai->dev,
+                                                 dma_data->filter_data);
+                ret = snd_dmaengine_pcm_open(substream, chan);
+        } else {
+                ret = snd_dmaengine_pcm_open_request_chan(substream,
+                                                          omap_dma_filter_fn,
+                                                          dma_data->filter_data);
+        }
+        return ret;
 }
 
 static int omap_pcm_mmap(struct snd_pcm_substream *substream,
diff --git a/sound/soc/s6000/s6000-pcm.c b/sound/soc/s6000/s6000-pcm.c
index 1358c7de2521..d0740a762963 100644
--- a/sound/soc/s6000/s6000-pcm.c
+++ b/sound/soc/s6000/s6000-pcm.c
@@ -128,7 +128,9 @@ static irqreturn_t s6000_pcm_irq(int irq, void *data)
                     substream->runtime &&
                     snd_pcm_running(substream)) {
                         dev_dbg(pcm->dev, "xrun\n");
+                        snd_pcm_stream_lock(substream);
                         snd_pcm_stop(substream, SNDRV_PCM_STATE_XRUN);
+                        snd_pcm_stream_unlock(substream);
                         ret = IRQ_HANDLED;
                 }
 
diff --git a/sound/soc/samsung/i2s.c b/sound/soc/samsung/i2s.c
index 7a1734697434..959c702235c8 100644
--- a/sound/soc/samsung/i2s.c
+++ b/sound/soc/samsung/i2s.c
@@ -742,13 +742,13 @@ static int config_setup(struct i2s_dai *i2s)
                 return -EAGAIN;
         }
 
-        /* Don't bother RFS, BFS & PSR in Slave mode */
-        if (is_slave(i2s))
-                return 0;
-
         set_bfs(i2s, bfs);
         set_rfs(i2s, rfs);
 
+        /* Don't bother with PSR in Slave mode */
+        if (is_slave(i2s))
+                return 0;
+
         if (!(i2s->quirks & QUIRK_NO_MUXPSR)) {
                 psr = i2s->rclk_srcrate / i2s->frmclk / rfs;
                 writel(((psr - 1) << 8) | PSR_PSREN, i2s->addr + I2SPSR);
diff --git a/sound/usb/6fire/pcm.c b/sound/usb/6fire/pcm.c
index c5b9cac37dc4..2aa4e13063a8 100644
--- a/sound/usb/6fire/pcm.c
+++ b/sound/usb/6fire/pcm.c
@@ -639,17 +639,25 @@ int usb6fire_pcm_init(struct sfire_chip *chip)
 void usb6fire_pcm_abort(struct sfire_chip *chip)
 {
         struct pcm_runtime *rt = chip->pcm;
+        unsigned long flags;
         int i;
 
         if (rt) {
                 rt->panic = true;
 
-                if (rt->playback.instance)
+                if (rt->playback.instance) {
+                        snd_pcm_stream_lock_irqsave(rt->playback.instance, flags);
                         snd_pcm_stop(rt->playback.instance,
                                         SNDRV_PCM_STATE_XRUN);
-                if (rt->capture.instance)
+                        snd_pcm_stream_unlock_irqrestore(rt->playback.instance, flags);
+                }
+
+                if (rt->capture.instance) {
+                        snd_pcm_stream_lock_irqsave(rt->capture.instance, flags);
                         snd_pcm_stop(rt->capture.instance,
                                         SNDRV_PCM_STATE_XRUN);
+                        snd_pcm_stream_unlock_irqrestore(rt->capture.instance, flags);
+                }
 
                 for (i = 0; i < PCM_N_URBS; i++) {
                         usb_poison_urb(&rt->in_urbs[i].instance);
diff --git a/sound/usb/misc/ua101.c b/sound/usb/misc/ua101.c
index 8b5d2c564e04..509315937f25 100644
--- a/sound/usb/misc/ua101.c
+++ b/sound/usb/misc/ua101.c
@@ -613,14 +613,24 @@ static int start_usb_playback(struct ua101 *ua)
 
 static void abort_alsa_capture(struct ua101 *ua)
 {
-        if (test_bit(ALSA_CAPTURE_RUNNING, &ua->states))
+        unsigned long flags;
+
+        if (test_bit(ALSA_CAPTURE_RUNNING, &ua->states)) {
+                snd_pcm_stream_lock_irqsave(ua->capture.substream, flags);
                 snd_pcm_stop(ua->capture.substream, SNDRV_PCM_STATE_XRUN);
+                snd_pcm_stream_unlock_irqrestore(ua->capture.substream, flags);
+        }
 }
 
 static void abort_alsa_playback(struct ua101 *ua)
 {
-        if (test_bit(ALSA_PLAYBACK_RUNNING, &ua->states))
+        unsigned long flags;
+
+        if (test_bit(ALSA_PLAYBACK_RUNNING, &ua->states)) {
+                snd_pcm_stream_lock_irqsave(ua->playback.substream, flags);
                 snd_pcm_stop(ua->playback.substream, SNDRV_PCM_STATE_XRUN);
+                snd_pcm_stream_unlock_irqrestore(ua->playback.substream, flags);
+        }
 }
 
 static int set_stream_hw(struct ua101 *ua, struct snd_pcm_substream *substream,
diff --git a/sound/usb/usx2y/usbusx2yaudio.c b/sound/usb/usx2y/usbusx2yaudio.c
index 4967fe9c938d..63fb5219f0f8 100644
--- a/sound/usb/usx2y/usbusx2yaudio.c
+++ b/sound/usb/usx2y/usbusx2yaudio.c
@@ -273,7 +273,11 @@ static void usX2Y_clients_stop(struct usX2Ydev *usX2Y)
                 struct snd_usX2Y_substream *subs = usX2Y->subs[s];
                 if (subs) {
                         if (atomic_read(&subs->state) >= state_PRERUNNING) {
+                                unsigned long flags;
+
+                                snd_pcm_stream_lock_irqsave(subs->pcm_substream, flags);
                                 snd_pcm_stop(subs->pcm_substream, SNDRV_PCM_STATE_XRUN);
+                                snd_pcm_stream_unlock_irqrestore(subs->pcm_substream, flags);
                         }
                         for (u = 0; u < NRURBS; u++) {
                                 struct urb *urb = subs->urb[u];