diff options
author | Maxime Ripard <maxime.ripard@free-electrons.com> | 2015-05-18 07:46:15 -0400 |
---|---|---|
committer | Vinod Koul <vinod.koul@intel.com> | 2015-06-12 08:46:39 -0400 |
commit | 4983a501afede12f95d26e1e213f8f2e9eda1871 (patch) | |
tree | f16d35cf4bbd0aa3c97b09409e251d0f4ec63dae /drivers/dma/dmaengine.c | |
parent | fbea28a2afb4251f985af52eb0180f097acaee16 (diff) |
dmaengine: Revert "drivers/dma: remove unused support for MEMSET operations"
This reverts commit 48a9db462d99494583dad829969616ac90a8df4e.
Some platforms actually need support for the memset operations. Bring it back.
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Diffstat (limited to 'drivers/dma/dmaengine.c')
-rw-r--r-- | drivers/dma/dmaengine.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/dma/dmaengine.c b/drivers/dma/dmaengine.c index a4c860dabf91..c0793818bb99 100644 --- a/drivers/dma/dmaengine.c +++ b/drivers/dma/dmaengine.c | |||
@@ -832,6 +832,8 @@ int dma_async_device_register(struct dma_device *device) | |||
832 | !device->device_prep_dma_pq); | 832 | !device->device_prep_dma_pq); |
833 | BUG_ON(dma_has_cap(DMA_PQ_VAL, device->cap_mask) && | 833 | BUG_ON(dma_has_cap(DMA_PQ_VAL, device->cap_mask) && |
834 | !device->device_prep_dma_pq_val); | 834 | !device->device_prep_dma_pq_val); |
835 | BUG_ON(dma_has_cap(DMA_MEMSET, device->cap_mask) && | ||
836 | !device->device_prep_dma_memset); | ||
835 | BUG_ON(dma_has_cap(DMA_INTERRUPT, device->cap_mask) && | 837 | BUG_ON(dma_has_cap(DMA_INTERRUPT, device->cap_mask) && |
836 | !device->device_prep_dma_interrupt); | 838 | !device->device_prep_dma_interrupt); |
837 | BUG_ON(dma_has_cap(DMA_SG, device->cap_mask) && | 839 | BUG_ON(dma_has_cap(DMA_SG, device->cap_mask) && |