git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'topic/misc' into for-linus
[safe/jmp/linux-2.6]
/
sound
/
arm
/
pxa2xx-pcm-lib.c
diff --git
a/sound/arm/pxa2xx-pcm-lib.c
b/sound/arm/pxa2xx-pcm-lib.c
index
743ac6a
..
8808b82
100644
(file)
--- a/
sound/arm/pxa2xx-pcm-lib.c
+++ b/
sound/arm/pxa2xx-pcm-lib.c
@@
-4,6
+4,7
@@
* published by the Free Software Foundation.
*/
+#include <linux/slab.h>
#include <linux/module.h>
#include <linux/dma-mapping.h>
@@
-205,6
+206,7
@@
int __pxa2xx_pcm_open(struct snd_pcm_substream *substream)
if (!rtd->dma_desc_array)
goto err1;
+ rtd->dma_ch = -1;
runtime->private_data = rtd;
return 0;