Merge branch 'for-next' into for-linus

2 files changed, 2 insertions, 11 deletions

diff --git a/sound/soc/atmel/atmel-pcm-dma.c b/sound/soc/atmel/atmel-pcm-dma.c
index b79a2a864513..33fb3bb133df 100644
--- a/sound/soc/atmel/atmel-pcm-dma.c
+++ b/sound/soc/atmel/atmel-pcm-dma.c
@@ -80,9 +80,7 @@ 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);
+                snd_pcm_stop_xrun(substream);
 
                 /* now drain RHR and read status to remove xrun condition */
                 ssc_readx(prtd->ssc->regs, SSC_RHR);
diff --git a/sound/soc/fsl/fsl_dma.c b/sound/soc/fsl/fsl_dma.c
index a609aafc994d..b2b108805b24 100644
--- a/sound/soc/fsl/fsl_dma.c
+++ b/sound/soc/fsl/fsl_dma.c
@@ -151,14 +151,7 @@ static const struct snd_pcm_hardware fsl_dma_hardware = {
  */
 static void fsl_dma_abort_stream(struct snd_pcm_substream *substream)
 {
-        unsigned long flags;
-
-        snd_pcm_stream_lock_irqsave(substream, flags);
-
-        if (snd_pcm_running(substream))
-                snd_pcm_stop(substream, SNDRV_PCM_STATE_XRUN);
-
-        snd_pcm_stream_unlock_irqrestore(substream, flags);
+        snd_pcm_stop_xrun(substream);
 }
 
 /**