From ea7f77d60f01a51ddae3f175f435db0770649a43 Mon Sep 17 00:00:00 2001
From: Stephen Warren <swarren@nvidia.com>
Date: Wed, 5 Jan 2011 14:24:12 -0700
Subject: [PATCH] --- yaml --- r: 235232 b: refs/heads/master c:
 499ef7a5c48ea9fe8034b61de304ce9f6b753fe7 h: refs/heads/master v: v3

---
 [refs]                          | 2 +-
 trunk/arch/arm/mach-tegra/dma.c | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 89afc47f1066..ded6425c750a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fe92a026e30050d5c79b2d41274211550a14cb04
+refs/heads/master: 499ef7a5c48ea9fe8034b61de304ce9f6b753fe7
diff --git a/trunk/arch/arm/mach-tegra/dma.c b/trunk/arch/arm/mach-tegra/dma.c
index 250bc7baa00a..4625e3ae766e 100644
--- a/trunk/arch/arm/mach-tegra/dma.c
+++ b/trunk/arch/arm/mach-tegra/dma.c
@@ -311,6 +311,7 @@ int tegra_dma_enqueue_req(struct tegra_dma_channel *ch,
 	struct tegra_dma_req *req)
 {
 	unsigned long irq_flags;
+	struct tegra_dma_req *_req;
 	int start_dma = 0;
 
 	if (req->size > NV_DMA_MAX_TRASFER_SIZE ||
@@ -321,6 +322,13 @@ int tegra_dma_enqueue_req(struct tegra_dma_channel *ch,
 
 	spin_lock_irqsave(&ch->lock, irq_flags);
 
+	list_for_each_entry(_req, &ch->list, node) {
+		if (req == _req) {
+		    spin_unlock_irqrestore(&ch->lock, irq_flags);
+		    return -EEXIST;
+		}
+	}
+
 	req->bytes_transferred = 0;
 	req->status = 0;
 	req->buffer_status = 0;