aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/dma/ioat_dma.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2008-08-07 21:52:57 -0400
committerDavid S. Miller <davem@davemloft.net>2008-08-07 21:52:57 -0400
commit22c7fdf4a7acfa24d9d498b1357e6c07d0e6c553 (patch)
tree040ce9c55cb285c5eff565942f313a07e157fbb2 /drivers/dma/ioat_dma.c
parent5423b2ed25993e13009ce39f55d742c3c6d03edb (diff)
parent86b89eed9aca2a4a335b9c1bf7380f9183db431f (diff)
Merge branch 'ath9k' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'drivers/dma/ioat_dma.c')
-rw-r--r--drivers/dma/ioat_dma.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/dma/ioat_dma.c b/drivers/dma/ioat_dma.c
index a52156e56886..bc8c6e3470ca 100644
--- a/drivers/dma/ioat_dma.c
+++ b/drivers/dma/ioat_dma.c
@@ -551,7 +551,7 @@ static dma_cookie_t ioat1_tx_submit(struct dma_async_tx_descriptor *tx)
551 /* write address into NextDescriptor field of last desc in chain */ 551 /* write address into NextDescriptor field of last desc in chain */
552 to_ioat_desc(ioat_chan->used_desc.prev)->hw->next = 552 to_ioat_desc(ioat_chan->used_desc.prev)->hw->next =
553 first->async_tx.phys; 553 first->async_tx.phys;
554 __list_splice(&new_chain, ioat_chan->used_desc.prev); 554 list_splice_tail(&new_chain, &ioat_chan->used_desc);
555 555
556 ioat_chan->dmacount += desc_count; 556 ioat_chan->dmacount += desc_count;
557 ioat_chan->pending += desc_count; 557 ioat_chan->pending += desc_count;