]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
net: ethernet: davinci_cpdma: decrease the desc count when cleaning up the remaining...
authorhtbegin <hotforest@gmail.com>
Mon, 1 Oct 2012 16:42:43 +0000 (16:42 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 12 Oct 2012 20:28:05 +0000 (05:28 +0900)
[ 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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/net/davinci_cpdma.c

index ae47f23ba93086855c5709985c368900d2b75b99..6b67c526c4612f3bdc9061637e806928b377349e 100644 (file)
@@ -849,6 +849,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 */