summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaciej Sosnowski <maciej.sosnowski@intel.com>2008-11-07 02:46:55 +0100
committerDavid S. Miller <davem@davemloft.net>2008-11-11 00:01:00 +0100
commit12ccea24e309d815d058cdc6ee8bf2c4b85f0c5f (patch)
tree70dae902b70b6025b21521a91f110e4a89d236a5
parent[2/4] I/OAT: fix dma_pin_iovec_pages() error handling (diff)
downloadlinux-12ccea24e309d815d058cdc6ee8bf2c4b85f0c5f.tar.xz
linux-12ccea24e309d815d058cdc6ee8bf2c4b85f0c5f.zip
[3/4] I/OAT: fix async_tx.callback checking
async_tx.callback should be checked for the first not the last descriptor in the chain. Cc: <stable@kernel.org> Signed-off-by: Maciej Sosnowski <maciej.sosnowski@intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/dma/ioat_dma.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/dma/ioat_dma.c b/drivers/dma/ioat_dma.c
index dbb8bbb83a32..ecd743f7cc61 100644
--- a/drivers/dma/ioat_dma.c
+++ b/drivers/dma/ioat_dma.c
@@ -525,7 +525,7 @@ static dma_cookie_t ioat1_tx_submit(struct dma_async_tx_descriptor *tx)
}
hw->ctl = IOAT_DMA_DESCRIPTOR_CTL_CP_STS;
- if (new->async_tx.callback) {
+ if (first->async_tx.callback) {
hw->ctl |= IOAT_DMA_DESCRIPTOR_CTL_INT_GN;
if (first != new) {
/* move callback into to last desc */
@@ -617,7 +617,7 @@ static dma_cookie_t ioat2_tx_submit(struct dma_async_tx_descriptor *tx)
}
hw->ctl |= IOAT_DMA_DESCRIPTOR_CTL_CP_STS;
- if (new->async_tx.callback) {
+ if (first->async_tx.callback) {
hw->ctl |= IOAT_DMA_DESCRIPTOR_CTL_INT_GN;
if (first != new) {
/* move callback into to last desc */