aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/dma/imx-sdma.c
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2011-01-31 10:21:35 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2011-01-31 12:34:24 +0100
commit7214a8b14f63a1603401124bc150e17b145aa476 (patch)
tree59c41a00966f3935edc235514a3780a7313d3437 /drivers/dma/imx-sdma.c
parent7a0e9b2557902bdca563a5eb1bbac87560bd7d20 (diff)
downloadkernel_samsung_smdk4412-7214a8b14f63a1603401124bc150e17b145aa476.zip
kernel_samsung_smdk4412-7214a8b14f63a1603401124bc150e17b145aa476.tar.gz
kernel_samsung_smdk4412-7214a8b14f63a1603401124bc150e17b145aa476.tar.bz2
dmaengine i.MX SDMA: 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/imx-sdma.c')
-rw-r--r--drivers/dma/imx-sdma.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c
index 3e848ee..eb25068 100644
--- a/drivers/dma/imx-sdma.c
+++ b/drivers/dma/imx-sdma.c
@@ -1295,6 +1295,9 @@ static int __init sdma_probe(struct platform_device *pdev)
sdma->version = pdata->sdma_version;
+ dma_cap_set(DMA_SLAVE, sdma->dma_device.cap_mask);
+ dma_cap_set(DMA_CYCLIC, sdma->dma_device.cap_mask);
+
INIT_LIST_HEAD(&sdma->dma_device.channels);
/* Initialize channel parameters */
for (i = 0; i < MAX_DMA_CHANNELS; i++) {
@@ -1303,9 +1306,6 @@ static int __init sdma_probe(struct platform_device *pdev)
sdmac->sdma = sdma;
spin_lock_init(&sdmac->lock);
- dma_cap_set(DMA_SLAVE, sdma->dma_device.cap_mask);
- dma_cap_set(DMA_CYCLIC, sdma->dma_device.cap_mask);
-
sdmac->chan.device = &sdma->dma_device;
sdmac->channel = i;