---

yaml --- r: 137166 b: refs/heads/master c: d667522 h: refs/heads/master v: v3
git-mirror · Dec 11, 2008 · 2f4c332 · 2f4c332
1 parent bc2f0dd
commit 2f4c332
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8c56afcbea22e472d3bfa8ddf06f23cd6bc56826
+refs/heads/master: d667522fdf637ef1b425518afe11aedba80364b2
diff --git a/trunk/arch/arm/kernel/dma.c b/trunk/arch/arm/kernel/dma.c
@@ -15,6 +15,7 @@
 #include <linux/init.h>
 #include <linux/spinlock.h>
 #include <linux/errno.h>
+#include <linux/scatterlist.h>
 
 #include <asm/dma.h>
 
@@ -37,6 +38,9 @@ int __init isa_dma_add(unsigned int chan, dma_t *dma)
 {
 	if (!dma->d_ops)
 		return -EINVAL;
+
+	sg_init_table(&dma->buf, 1);
+
 	if (dma_chan[chan])
 		return -EBUSY;
 	dma_chan[chan] = dma;