diff options
| author | Vinod Koul <vkoul@kernel.org> | 2018-10-24 09:15:43 +0100 |
|---|---|---|
| committer | Vinod Koul <vkoul@kernel.org> | 2018-10-24 09:15:43 +0100 |
| commit | b8bb45cbb3873f38715471726530eedf39a13ac7 (patch) | |
| tree | 16cedc02d890f85450df659996fda7fa90553e2f /drivers/dma/pxa_dma.c | |
| parent | edc329fbb8de57afd144632cdb0749c7da27810a (diff) | |
| parent | a436ff1e96b9e1f34952915fe143a75a4ad8b561 (diff) | |
| download | talos-obmc-linux-b8bb45cbb3873f38715471726530eedf39a13ac7.tar.gz talos-obmc-linux-b8bb45cbb3873f38715471726530eedf39a13ac7.zip | |
Merge branch 'topic/dmam' into for-linus
Diffstat (limited to 'drivers/dma/pxa_dma.c')
| -rw-r--r-- | drivers/dma/pxa_dma.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/dma/pxa_dma.c b/drivers/dma/pxa_dma.c index b31c28b67ad3..825725057e00 100644 --- a/drivers/dma/pxa_dma.c +++ b/drivers/dma/pxa_dma.c @@ -1285,7 +1285,6 @@ static int pxad_remove(struct platform_device *op) pxad_cleanup_debugfs(pdev); pxad_free_channels(&pdev->slave); - dma_async_device_unregister(&pdev->slave); return 0; } @@ -1396,7 +1395,7 @@ static int pxad_init_dmadev(struct platform_device *op, init_waitqueue_head(&c->wq_state); } - return dma_async_device_register(&pdev->slave); + return dmaenginem_async_device_register(&pdev->slave); } static int pxad_probe(struct platform_device *op) @@ -1433,7 +1432,7 @@ static int pxad_probe(struct platform_device *op) "#dma-requests set to default 32 as missing in OF: %d", ret); nb_requestors = 32; - }; + } } else if (pdata && pdata->dma_channels) { dma_channels = pdata->dma_channels; nb_requestors = pdata->nb_requestors; |
