From a8f0a34fb307f1133ea025fa0ca273c61fcf1fca Mon Sep 17 00:00:00 2001 From: Zhang Wei Date: Thu, 13 Mar 2008 17:45:28 -0700 Subject: [PATCH] --- yaml --- r: 87353 b: refs/heads/master c: 9b941c6660bae673e27c207f1d20d98ef8ecd450 h: refs/heads/master i: 87351: 480273c4c7c162edd46c6484847297f277d106a4 v: v3 --- [refs] | 2 +- trunk/drivers/dma/dmaengine.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 7438de068452..69b3bb295581 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 56822843ff99c88c778a614851328fcbb1503d10 +refs/heads/master: 9b941c6660bae673e27c207f1d20d98ef8ecd450 diff --git a/trunk/drivers/dma/dmaengine.c b/trunk/drivers/dma/dmaengine.c index 29965231b912..8db0e7f9d3f4 100644 --- a/trunk/drivers/dma/dmaengine.c +++ b/trunk/drivers/dma/dmaengine.c @@ -357,7 +357,7 @@ int dma_async_device_register(struct dma_device *device) !device->device_prep_dma_zero_sum); BUG_ON(dma_has_cap(DMA_MEMSET, device->cap_mask) && !device->device_prep_dma_memset); - BUG_ON(dma_has_cap(DMA_ZERO_SUM, device->cap_mask) && + BUG_ON(dma_has_cap(DMA_INTERRUPT, device->cap_mask) && !device->device_prep_dma_interrupt); BUG_ON(!device->device_alloc_chan_resources);