From 86852339954ffeb287687826fcb58403a1152825 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Thu, 19 Nov 2009 17:11:03 -0700 Subject: [PATCH] --- yaml --- r: 168863 b: refs/heads/master c: 49954c1567cb0d70d28bb5512d471dc5bd4e2c3f h: refs/heads/master i: 168861: 38d040011438f185d2c55a6e5b626c566c8de50a 168859: fd9861caa840e6efda7e5f578497afcf36596c08 168855: 00d17ceb8454d72056d2c3e9e8077d3bf8c76feb 168847: 81e54cbe1821404f452307a777b7d559efc9913b 168831: ccaaac79cef77466ec912b322973f312122e159e v: v3 --- [refs] | 2 +- trunk/drivers/dma/ioat/dma_v3.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 271fe5445c44..3cf3907b87a0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7b3cc2b1fc2066391e498f3387204908c4eced21 +refs/heads/master: 49954c1567cb0d70d28bb5512d471dc5bd4e2c3f diff --git a/trunk/drivers/dma/ioat/dma_v3.c b/trunk/drivers/dma/ioat/dma_v3.c index 189788f6351e..42f6f10fb0cc 100644 --- a/trunk/drivers/dma/ioat/dma_v3.c +++ b/trunk/drivers/dma/ioat/dma_v3.c @@ -571,7 +571,7 @@ __ioat3_prep_xor_lock(struct dma_chan *c, enum sum_check_flags *result, dump_desc_dbg(ioat, compl_desc); /* we leave the channel locked to ensure in order submission */ - return &desc->txd; + return &compl_desc->txd; } static struct dma_async_tx_descriptor * @@ -730,7 +730,7 @@ __ioat3_prep_pq_lock(struct dma_chan *c, enum sum_check_flags *result, dump_desc_dbg(ioat, compl_desc); /* we leave the channel locked to ensure in order submission */ - return &desc->txd; + return &compl_desc->txd; } static struct dma_async_tx_descriptor *