diff options
Diffstat (limited to 'drivers/dma/dw_dmac.c')
-rw-r--r-- | drivers/dma/dw_dmac.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/dma/dw_dmac.c b/drivers/dma/dw_dmac.c index 4d180ca9a1d8..9bfd6d360718 100644 --- a/drivers/dma/dw_dmac.c +++ b/drivers/dma/dw_dmac.c | |||
@@ -1407,12 +1407,11 @@ static int __init dw_probe(struct platform_device *pdev) | |||
1407 | dw->all_chan_mask = (1 << pdata->nr_channels) - 1; | 1407 | dw->all_chan_mask = (1 << pdata->nr_channels) - 1; |
1408 | 1408 | ||
1409 | INIT_LIST_HEAD(&dw->dma.channels); | 1409 | INIT_LIST_HEAD(&dw->dma.channels); |
1410 | for (i = 0; i < pdata->nr_channels; i++, dw->dma.chancnt++) { | 1410 | for (i = 0; i < pdata->nr_channels; i++) { |
1411 | struct dw_dma_chan *dwc = &dw->chan[i]; | 1411 | struct dw_dma_chan *dwc = &dw->chan[i]; |
1412 | 1412 | ||
1413 | dwc->chan.device = &dw->dma; | 1413 | dwc->chan.device = &dw->dma; |
1414 | dwc->chan.cookie = dwc->completed = 1; | 1414 | dwc->chan.cookie = dwc->completed = 1; |
1415 | dwc->chan.chan_id = i; | ||
1416 | if (pdata->chan_allocation_order == CHAN_ALLOCATION_ASCENDING) | 1415 | if (pdata->chan_allocation_order == CHAN_ALLOCATION_ASCENDING) |
1417 | list_add_tail(&dwc->chan.device_node, | 1416 | list_add_tail(&dwc->chan.device_node, |
1418 | &dw->dma.channels); | 1417 | &dw->dma.channels); |
@@ -1468,7 +1467,7 @@ static int __init dw_probe(struct platform_device *pdev) | |||
1468 | dma_writel(dw, CFG, DW_CFG_DMA_EN); | 1467 | dma_writel(dw, CFG, DW_CFG_DMA_EN); |
1469 | 1468 | ||
1470 | printk(KERN_INFO "%s: DesignWare DMA Controller, %d channels\n", | 1469 | printk(KERN_INFO "%s: DesignWare DMA Controller, %d channels\n", |
1471 | dev_name(&pdev->dev), dw->dma.chancnt); | 1470 | dev_name(&pdev->dev), pdata->nr_channels); |
1472 | 1471 | ||
1473 | dma_async_device_register(&dw->dma); | 1472 | dma_async_device_register(&dw->dma); |
1474 | 1473 | ||