aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/ata/pata_arasan_cf.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/ata/pata_arasan_cf.c b/drivers/ata/pata_arasan_cf.c
index 4edb1a81f63f..38216b991474 100644
--- a/drivers/ata/pata_arasan_cf.c
+++ b/drivers/ata/pata_arasan_cf.c
@@ -420,7 +420,7 @@ dma_xfer(struct arasan_cf_dev *acdev, dma_addr_t src, dma_addr_t dest, u32 len)
420 420
421 /* Wait for DMA to complete */ 421 /* Wait for DMA to complete */
422 if (!wait_for_completion_timeout(&acdev->dma_completion, TIMEOUT)) { 422 if (!wait_for_completion_timeout(&acdev->dma_completion, TIMEOUT)) {
423 chan->device->device_control(chan, DMA_TERMINATE_ALL, 0); 423 dmaengine_terminate_all(chan);
424 dev_err(acdev->host->dev, "wait_for_completion_timeout\n"); 424 dev_err(acdev->host->dev, "wait_for_completion_timeout\n");
425 return -ETIMEDOUT; 425 return -ETIMEDOUT;
426 } 426 }
@@ -928,8 +928,7 @@ static int arasan_cf_suspend(struct device *dev)
928 struct arasan_cf_dev *acdev = host->ports[0]->private_data; 928 struct arasan_cf_dev *acdev = host->ports[0]->private_data;
929 929
930 if (acdev->dma_chan) 930 if (acdev->dma_chan)
931 acdev->dma_chan->device->device_control(acdev->dma_chan, 931 dmaengine_terminate_all(acdev->dma_chan);
932 DMA_TERMINATE_ALL, 0);
933 932
934 cf_exit(acdev); 933 cf_exit(acdev);
935 return ata_host_suspend(host, PMSG_SUSPEND); 934 return ata_host_suspend(host, PMSG_SUSPEND);