From cd8dd9fdb84f0436e88edec2efbd30bf5008ecd3 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Wed, 3 Mar 2010 21:21:10 -0700 Subject: [PATCH] --- yaml --- r: 185765 b: refs/heads/master c: aa75db0080603bae27961c0502812dfd0f522bb3 h: refs/heads/master i: 185763: 1fe77d9d2d5a872768e3c7ab34ccfa95a7a25ccc v: v3 --- [refs] | 2 +- trunk/drivers/dma/ioat/dma_v2.c | 2 +- trunk/drivers/dma/ioat/dma_v3.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 55ea162f60bc..00a80be3aa4f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 281befa5592b0c5f9a3856b5666c62ac66d3d9ee +refs/heads/master: aa75db0080603bae27961c0502812dfd0f522bb3 diff --git a/trunk/drivers/dma/ioat/dma_v2.c b/trunk/drivers/dma/ioat/dma_v2.c index c6e4531fe524..01ed1cfd3eb6 100644 --- a/trunk/drivers/dma/ioat/dma_v2.c +++ b/trunk/drivers/dma/ioat/dma_v2.c @@ -158,7 +158,7 @@ static void __cleanup(struct ioat2_dma_chan *ioat, unsigned long phys_complete) seen_current = true; } ioat->tail += i; - BUG_ON(!seen_current); /* no active descs have written a completion? */ + BUG_ON(active && !seen_current); /* no active descs have written a completion? */ chan->last_completion = phys_complete; if (ioat->head == ioat->tail) { diff --git a/trunk/drivers/dma/ioat/dma_v3.c b/trunk/drivers/dma/ioat/dma_v3.c index bff48e8cffc4..39520f2f7da9 100644 --- a/trunk/drivers/dma/ioat/dma_v3.c +++ b/trunk/drivers/dma/ioat/dma_v3.c @@ -293,7 +293,7 @@ static void __cleanup(struct ioat2_dma_chan *ioat, unsigned long phys_complete) } } ioat->tail += i; - BUG_ON(!seen_current); /* no active descs have written a completion? */ + BUG_ON(active && !seen_current); /* no active descs have written a completion? */ chan->last_completion = phys_complete; if (ioat->head == ioat->tail) { dev_dbg(to_dev(chan), "%s: cancel completion timeout\n",