diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2011-01-31 04:21:35 -0500 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2011-01-31 06:34:24 -0500 |
commit | 7214a8b14f63a1603401124bc150e17b145aa476 (patch) | |
tree | 59c41a00966f3935edc235514a3780a7313d3437 /drivers/dma | |
parent | 7a0e9b2557902bdca563a5eb1bbac87560bd7d20 (diff) |
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')
-rw-r--r-- | drivers/dma/imx-sdma.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c index 3e848ee9a18a..eb250681804b 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) | |||
1295 | 1295 | ||
1296 | sdma->version = pdata->sdma_version; | 1296 | sdma->version = pdata->sdma_version; |
1297 | 1297 | ||
1298 | dma_cap_set(DMA_SLAVE, sdma->dma_device.cap_mask); | ||
1299 | dma_cap_set(DMA_CYCLIC, sdma->dma_device.cap_mask); | ||
1300 | |||
1298 | INIT_LIST_HEAD(&sdma->dma_device.channels); | 1301 | INIT_LIST_HEAD(&sdma->dma_device.channels); |
1299 | /* Initialize channel parameters */ | 1302 | /* Initialize channel parameters */ |
1300 | for (i = 0; i < MAX_DMA_CHANNELS; i++) { | 1303 | for (i = 0; i < MAX_DMA_CHANNELS; i++) { |
@@ -1303,9 +1306,6 @@ static int __init sdma_probe(struct platform_device *pdev) | |||
1303 | sdmac->sdma = sdma; | 1306 | sdmac->sdma = sdma; |
1304 | spin_lock_init(&sdmac->lock); | 1307 | spin_lock_init(&sdmac->lock); |
1305 | 1308 | ||
1306 | dma_cap_set(DMA_SLAVE, sdma->dma_device.cap_mask); | ||
1307 | dma_cap_set(DMA_CYCLIC, sdma->dma_device.cap_mask); | ||
1308 | |||
1309 | sdmac->chan.device = &sdma->dma_device; | 1309 | sdmac->chan.device = &sdma->dma_device; |
1310 | sdmac->channel = i; | 1310 | sdmac->channel = i; |
1311 | 1311 | ||