From 7ce6eb5b496668ad06064f3fa720ae76694b18ca Mon Sep 17 00:00:00 2001
From: Timur Tabi <timur@freescale.com>
Date: Fri, 19 Sep 2008 04:16:19 -0700
Subject: [PATCH] --- yaml --- r: 116294 b: refs/heads/master c:
 6b3141962dc82cfe1c30afdf91d564b309859cbe h: refs/heads/master v: v3

---
 [refs]                      | 2 +-
 trunk/drivers/dma/dmatest.c | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index fc973adf37a4..4b38db10d498 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 89f72a0633d1d4f28c4c5c8831ec814523d7671a
+refs/heads/master: 6b3141962dc82cfe1c30afdf91d564b309859cbe
diff --git a/trunk/drivers/dma/dmatest.c b/trunk/drivers/dma/dmatest.c
index a08d19704743..422500c6c163 100644
--- a/trunk/drivers/dma/dmatest.c
+++ b/trunk/drivers/dma/dmatest.c
@@ -325,6 +325,11 @@ static enum dma_state_client dmatest_add_channel(struct dma_chan *chan)
 	struct dmatest_thread	*thread;
 	unsigned int		i;
 
+	/* Have we already been told about this channel? */
+	list_for_each_entry(dtc, &dmatest_channels, node)
+		if (dtc->chan == chan)
+			return DMA_DUP;
+
 	dtc = kmalloc(sizeof(struct dmatest_chan), GFP_ATOMIC);
 	if (!dtc) {
 		pr_warning("dmatest: No memory for %s\n", chan->dev.bus_id);