summaryrefslogtreecommitdiffstats
path: root/drivers/dma
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2011-01-31 11:35:59 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2011-01-31 12:36:23 +0100
commitf8a356ff96a9070156f863e4f7716e2a0eb8c995 (patch)
tree841388fffbd9bbca97f48cc64d6b58c8cfa829cd /drivers/dma
parent97a43dfe84119528ec2576129b91d619219ab716 (diff)
downloadlinux-stable-f8a356ff96a9070156f863e4f7716e2a0eb8c995.tar.gz
linux-stable-f8a356ff96a9070156f863e4f7716e2a0eb8c995.tar.bz2
linux-stable-f8a356ff96a9070156f863e4f7716e2a0eb8c995.zip
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.c6
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)
INIT_LIST_HEAD(&imxdma->dma_device.channels);
+ dma_cap_set(DMA_SLAVE, imxdma->dma_device.cap_mask);
+ dma_cap_set(DMA_CYCLIC, imxdma->dma_device.cap_mask);
+
/* Initialize channel parameters */
for (i = 0; i < MAX_DMA_CHANNELS; i++) {
struct imxdma_channel *imxdmac = &imxdma->channel[i];
@@ -362,9 +365,6 @@ static int __init imxdma_probe(struct platform_device *pdev)
imxdmac->imxdma = imxdma;
spin_lock_init(&imxdmac->lock);
- dma_cap_set(DMA_SLAVE, imxdma->dma_device.cap_mask);
- dma_cap_set(DMA_CYCLIC, imxdma->dma_device.cap_mask);
-
imxdmac->chan.device = &imxdma->dma_device;
imxdmac->channel = i;