From 2f4c332c5ddc5a1f382643a077a912af9bc12104 Mon Sep 17 00:00:00 2001
From: Russell King <rmk@dyn-67.arm.linux.org.uk>
Date: Mon, 8 Dec 2008 17:50:25 +0000
Subject: [PATCH] --- yaml --- r: 137166 b: refs/heads/master c:
 d667522fdf637ef1b425518afe11aedba80364b2 h: refs/heads/master v: v3

---
 [refs]                      | 2 +-
 trunk/arch/arm/kernel/dma.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 9d1aa90a1371..b449a8fa7ad2 100644
--- 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
index aab24f03ea14..e7828fcd9544 100644
--- 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;