diff options
| author | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2015-10-23 21:26:54 +0200 |
|---|---|---|
| committer | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2015-10-23 21:26:54 +0200 |
| commit | 61441d066d8f7691ad3d9afdf1d3ae94a478c057 (patch) | |
| tree | 0876449595bcdb6b05e0393805fc170598b65d03 /sound/arm/pxa2xx-pcm-lib.c | |
| parent | de04df3a2555ac04d19c3ad6528503d5bf4ab0e7 (diff) | |
| download | kernel_samsung_smdk4412-61441d066d8f7691ad3d9afdf1d3ae94a478c057.zip kernel_samsung_smdk4412-61441d066d8f7691ad3d9afdf1d3ae94a478c057.tar.gz kernel_samsung_smdk4412-61441d066d8f7691ad3d9afdf1d3ae94a478c057.tar.bz2 | |
remove compat from include, get new scripts working
further update code, especially sound
remove initramfs files for galaxys2 and d710 and a busybox binary
Diffstat (limited to 'sound/arm/pxa2xx-pcm-lib.c')
| -rw-r--r-- | sound/arm/pxa2xx-pcm-lib.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/arm/pxa2xx-pcm-lib.c b/sound/arm/pxa2xx-pcm-lib.c index 76e0d56..823359e 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); |