git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'nfs-for-2.6.32'
[pandora-kernel.git]
/
sound
/
arm
/
pxa2xx-pcm-lib.c
diff --git
a/sound/arm/pxa2xx-pcm-lib.c
b/sound/arm/pxa2xx-pcm-lib.c
index
6205f37
..
743ac6a
100644
(file)
--- a/
sound/arm/pxa2xx-pcm-lib.c
+++ b/
sound/arm/pxa2xx-pcm-lib.c
@@
-136,6
+136,9
@@
int __pxa2xx_pcm_prepare(struct snd_pcm_substream *substream)
{
struct pxa2xx_runtime_data *prtd = substream->runtime->private_data;
+ if (!prtd || !prtd->params)
+ return 0;
+
DCSR(prtd->dma_ch) &= ~DCSR_RUN;
DCSR(prtd->dma_ch) = 0;
DCMD(prtd->dma_ch) = 0;