From 093290406c6d5b3c5eb120bf459621dc334084cf Mon Sep 17 00:00:00 2001 From: Christian Riesch Date: Wed, 22 Feb 2012 21:58:00 +0000 Subject: [PATCH] --- yaml --- r: 290439 b: refs/heads/master c: b4ad0428139491355ea8742294c77942c312c5bb h: refs/heads/master i: 290437: 8f4fb0c2bfa922c88604ba2ec467ca316b8f0945 290435: 46b5d4c9042c1626f460eeac8d5963fb0e4039e1 290431: 2027a589337c7ece933a201e1f4c799a09c013ae v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/ti/davinci_cpdma.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index fb77807b168c..73c8982d1672 100644 --- 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 index c97d2f590855..34558766cbf0 100644 --- 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 */