diff options
| author | Vinod Koul <vinod.koul@intel.com> | 2016-05-17 06:43:40 +0200 |
|---|---|---|
| committer | Vinod Koul <vinod.koul@intel.com> | 2016-05-17 06:43:40 +0200 |
| commit | a365c9685438713dbf88828282c4699f571b97de (patch) | |
| tree | 99771a8be3519ff8fc1ff477e9f41cb53e2a1af7 /drivers/dma/dmaengine.c | |
| parent | dmaengine: ioatdma: disable relaxed ordering for ioatdma (diff) | |
| parent | dmaengine: of_dma: approximate an average distribution (diff) | |
| download | linux-a365c9685438713dbf88828282c4699f571b97de.tar.xz linux-a365c9685438713dbf88828282c4699f571b97de.zip | |
Merge branch 'topic/core' into for-linus
Diffstat (limited to 'drivers/dma/dmaengine.c')
| -rw-r--r-- | drivers/dma/dmaengine.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/dma/dmaengine.c b/drivers/dma/dmaengine.c index ca1400d66957..8c9f45fd55fc 100644 --- a/drivers/dma/dmaengine.c +++ b/drivers/dma/dmaengine.c @@ -482,7 +482,8 @@ int dma_get_slave_caps(struct dma_chan *chan, struct dma_slave_caps *caps) device = chan->device; /* check if the channel supports slave transactions */ - if (!test_bit(DMA_SLAVE, device->cap_mask.bits)) + if (!(test_bit(DMA_SLAVE, device->cap_mask.bits) || + test_bit(DMA_CYCLIC, device->cap_mask.bits))) return -ENXIO; /* @@ -865,12 +866,12 @@ static bool device_has_all_tx_types(struct dma_device *device) return false; #endif - #if defined(CONFIG_ASYNC_MEMCPY) || defined(CONFIG_ASYNC_MEMCPY_MODULE) + #if IS_ENABLED(CONFIG_ASYNC_MEMCPY) if (!dma_has_cap(DMA_MEMCPY, device->cap_mask)) return false; #endif - #if defined(CONFIG_ASYNC_XOR) || defined(CONFIG_ASYNC_XOR_MODULE) + #if IS_ENABLED(CONFIG_ASYNC_XOR) if (!dma_has_cap(DMA_XOR, device->cap_mask)) return false; @@ -880,7 +881,7 @@ static bool device_has_all_tx_types(struct dma_device *device) #endif #endif - #if defined(CONFIG_ASYNC_PQ) || defined(CONFIG_ASYNC_PQ_MODULE) + #if IS_ENABLED(CONFIG_ASYNC_PQ) if (!dma_has_cap(DMA_PQ, device->cap_mask)) return false; |