summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhtbegin <hotforest@gmail.com>2012-10-01 16:42:43 +0000
committerBen Hutchings <ben@decadent.org.uk>2012-10-10 03:31:25 +0100
commitaabc054d7cd5778d021c5b50ee5f4d2406072562 (patch)
treed07549cd5d741dcf4598b144bb0927e6e0b82569
parentab98741ba1888af9aeb4a88423bda1e2d93932e5 (diff)
net: ethernet: davinci_cpdma: decrease the desc count when cleaning up the remaining packets
[ Upstream commit ffb5ba90017505a19e238e986e6d33f09e4df765 ] chan->count is used by rx channel. If the desc count is not updated by the clean up loop in cpdma_chan_stop, the value written to the rxfree register in cpdma_chan_start will be incorrect. Signed-off-by: Tao Hou <hotforest@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
-rw-r--r--drivers/net/ethernet/ti/davinci_cpdma.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/ethernet/ti/davinci_cpdma.c b/drivers/net/ethernet/ti/davinci_cpdma.c
index c97d2f590855..bfc3b0d614a7 100644
--- a/drivers/net/ethernet/ti/davinci_cpdma.c
+++ b/drivers/net/ethernet/ti/davinci_cpdma.c
@@ -851,6 +851,7 @@ int cpdma_chan_stop(struct cpdma_chan *chan)
next_dma = desc_read(desc, hw_next);
chan->head = desc_from_phys(pool, next_dma);
+ chan->count--;
chan->stats.teardown_dequeue++;
/* issue callback without locks held */