xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Koodi Ongelmat Pull-pyynnöt Actions Paketit Projektit Julkaisut Wiki Toiminta

Merge branch 'topic/dmam' into for-linus

Selaa lähdekoodia
This commit is contained in:
Vinod Koul
2018-10-24 09:15:43 +01:00
vanhempi edc329fbb8 a436ff1e96
commit b8bb45cbb3
8 muutettua tiedostoa jossa 16 lisäystä ja 36 poistoa
Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/dma/mmp_tdma.c
Näytä tiedosto

@@ -548,9 +548,6 @@ static void mmp_tdma_issue_pending(struct dma_chan *chan)
static int mmp_tdma_remove(struct platform_device *pdev)
{
struct mmp_tdma_device *tdev = platform_get_drvdata(pdev);
dma_async_device_unregister(&tdev->device);
return 0;
}
@@ -714,7 +711,7 @@ static int mmp_tdma_probe(struct platform_device *pdev)
dma_set_mask(&pdev->dev, DMA_BIT_MASK(64));
platform_set_drvdata(pdev, tdev);
ret = dma_async_device_register(&tdev->device);
ret = dmaenginem_async_device_register(&tdev->device);
if (ret) {
dev_err(tdev->device.dev, "unable to register\n");
return ret;
@@ -726,7 +723,7 @@ static int mmp_tdma_probe(struct platform_device *pdev)
if (ret) {
dev_err(tdev->device.dev,
"failed to register controller\n");
dma_async_device_unregister(&tdev->device);
return ret;
}
}