diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2011-01-31 05:35:59 -0500 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2011-01-31 06:36:23 -0500 |
commit | f8a356ff96a9070156f863e4f7716e2a0eb8c995 (patch) | |
tree | 841388fffbd9bbca97f48cc64d6b58c8cfa829cd /drivers/dma | |
parent | 97a43dfe84119528ec2576129b91d619219ab716 (diff) |
dmaengine i.MX dma: initialize dma capabilities outside channel loop
The capabilities are device specific fields, not channel specific fields.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers/dma')
-rw-r--r-- | drivers/dma/imx-dma.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/dma/imx-dma.c b/drivers/dma/imx-dma.c index 82627087b550..e18eaabe92b9 100644 --- a/drivers/dma/imx-dma.c +++ b/drivers/dma/imx-dma.c | |||
@@ -345,6 +345,9 @@ static int __init imxdma_probe(struct platform_device *pdev) | |||
345 | 345 | ||
346 | INIT_LIST_HEAD(&imxdma->dma_device.channels); | 346 | INIT_LIST_HEAD(&imxdma->dma_device.channels); |
347 | 347 | ||
348 | dma_cap_set(DMA_SLAVE, imxdma->dma_device.cap_mask); | ||
349 | dma_cap_set(DMA_CYCLIC, imxdma->dma_device.cap_mask); | ||
350 | |||
348 | /* Initialize channel parameters */ | 351 | /* Initialize channel parameters */ |
349 | for (i = 0; i < MAX_DMA_CHANNELS; i++) { | 352 | for (i = 0; i < MAX_DMA_CHANNELS; i++) { |
350 | struct imxdma_channel *imxdmac = &imxdma->channel[i]; | 353 | struct imxdma_channel *imxdmac = &imxdma->channel[i]; |
@@ -362,9 +365,6 @@ static int __init imxdma_probe(struct platform_device *pdev) | |||
362 | imxdmac->imxdma = imxdma; | 365 | imxdmac->imxdma = imxdma; |
363 | spin_lock_init(&imxdmac->lock); | 366 | spin_lock_init(&imxdmac->lock); |
364 | 367 | ||
365 | dma_cap_set(DMA_SLAVE, imxdma->dma_device.cap_mask); | ||
366 | dma_cap_set(DMA_CYCLIC, imxdma->dma_device.cap_mask); | ||
367 | |||
368 | imxdmac->chan.device = &imxdma->dma_device; | 368 | imxdmac->chan.device = &imxdma->dma_device; |
369 | imxdmac->channel = i; | 369 | imxdmac->channel = i; |
370 | 370 | ||