summaryrefslogtreecommitdiffstats
path: root/sound/arm/pxa2xx-pcm-lib.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2014-11-07 17:08:28 +0100
committerTakashi Iwai <tiwai@suse.de>2014-11-09 18:20:40 +0100
commit1fb8510cdb5b7befe8a59f533c7fc12ef0dac73e (patch)
treeb44569425ea7683d02893cfd145081a11d7677f1 /sound/arm/pxa2xx-pcm-lib.c
parentALSA: snd_ctl_activate_id(): Fix index look-up (diff)
downloadlinux-1fb8510cdb5b7befe8a59f533c7fc12ef0dac73e.tar.xz
linux-1fb8510cdb5b7befe8a59f533c7fc12ef0dac73e.zip
ALSA: pcm: Add snd_pcm_stop_xrun() helper
Add a new helper function snd_pcm_stop_xrun() to the standard sequnce lock/snd_pcm_stop(XRUN)/unlock by a single call, and replace the existing open codes with this helper. The function checks the PCM running state to prevent setting the wrong state, too, for more safety. Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/arm/pxa2xx-pcm-lib.c')
-rw-r--r--sound/arm/pxa2xx-pcm-lib.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/sound/arm/pxa2xx-pcm-lib.c b/sound/arm/pxa2xx-pcm-lib.c
index a61d7a9a995e..01f8fdc42b1b 100644
--- a/sound/arm/pxa2xx-pcm-lib.c
+++ b/sound/arm/pxa2xx-pcm-lib.c
@@ -200,9 +200,7 @@ void pxa2xx_pcm_dma_irq(int dma_ch, void *dev_id)
} else {
printk(KERN_ERR "DMA error on channel %d (DCSR=%#x)\n",
dma_ch, dcsr);
- snd_pcm_stream_lock(substream);
- snd_pcm_stop(substream, SNDRV_PCM_STATE_XRUN);
- snd_pcm_stream_unlock(substream);
+ snd_pcm_stop_xrun(substream);
}
}
EXPORT_SYMBOL(pxa2xx_pcm_dma_irq);