---

yaml --- r: 290439 b: refs/heads/master c: b4ad042 h: refs/heads/master i: 290437: 8f4fb0c 290435: 46b5d4c 290431: 2027a58 v: v3
git-mirror · Feb 24, 2012 · 0932904 · 0932904
1 parent 9915904
commit 0932904
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d708f6039b21ca8f0508ba1da1aaf3d00a36446f
+refs/heads/master: b4ad0428139491355ea8742294c77942c312c5bb
diff --git a/trunk/drivers/net/ethernet/ti/davinci_cpdma.c b/trunk/drivers/net/ethernet/ti/davinci_cpdma.c
@@ -822,7 +822,7 @@ int cpdma_chan_stop(struct cpdma_chan *chan)
 	dma_reg_write(ctlr, chan->int_clear, chan->mask);
 
 	/* trigger teardown */
-	dma_reg_write(ctlr, chan->td, chan->chan_num);
+	dma_reg_write(ctlr, chan->td, chan_linear(chan));
 
 	/* wait for teardown complete */
 	timeout = jiffies + HZ/10;	/* 100 msec */