---

yaml --- r: 116294 b: refs/heads/master c: 6b31419 h: refs/heads/master v: v3
git-mirror · Sep 19, 2008 · 7ce6eb5 · 7ce6eb5
1 parent e40aef2
commit 7ce6eb5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git 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
@@ -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);