diff options
| author | Tejun Heo <tj@kernel.org> | 2014-05-27 09:33:33 -0400 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2014-05-27 09:33:33 -0400 |
| commit | fc6db7a446594516a3419a344999152d5cb14638 (patch) | |
| tree | e9edc699fe2f78d7f2a630021433100bf088803d /drivers/ata | |
| parent | 6e4f212a311b04355361f85a6195457c17296602 (diff) | |
| parent | 69493e0b0a8b5d4a0df7df82bad49ad07ae6921d (diff) | |
Merge branch 'for-3.16' into for-next
Diffstat (limited to 'drivers/ata')
| -rw-r--r-- | drivers/ata/pata_ep93xx.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/ata/pata_ep93xx.c b/drivers/ata/pata_ep93xx.c index cad9d45749c..6ad5c072ce3 100644 --- a/drivers/ata/pata_ep93xx.c +++ b/drivers/ata/pata_ep93xx.c @@ -708,8 +708,8 @@ static void ep93xx_pata_dma_start(struct ata_queued_cmd *qc) struct dma_chan *channel = qc->dma_dir == DMA_TO_DEVICE ? drv_data->dma_tx_channel : drv_data->dma_rx_channel; - txd = channel->device->device_prep_slave_sg(channel, qc->sg, - qc->n_elem, qc->dma_dir, DMA_CTRL_ACK, NULL); + txd = dmaengine_prep_slave_sg(channel, qc->sg, qc->n_elem, qc->dma_dir, + DMA_CTRL_ACK); if (!txd) { dev_err(qc->ap->dev, "failed to prepare slave for sg dma\n"); return; |