diff options
| author | Vinod Koul <vinod.koul@intel.com> | 2014-10-15 20:08:49 +0400 |
|---|---|---|
| committer | Vinod Koul <vinod.koul@intel.com> | 2014-10-15 20:08:49 +0400 |
| commit | 2856fcdc1f7b6dc237afc2dbec6fbd21fe88dd4e (patch) | |
| tree | df1adfeb56129acd267b658f81350437a5361b57 /drivers/net | |
| parent | 639559ada6194b722304fe267455b5bdf75c2f90 (diff) | |
| parent | a500789d42f478bc5511e1ddafadc323a6036d11 (diff) | |
| download | linux-2856fcdc1f7b6dc237afc2dbec6fbd21fe88dd4e.tar.xz | |
Merge branch 'topic/dma_control_cleanup_acks' into for-linus
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/ethernet/micrel/ks8842.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/ethernet/micrel/ks8842.c b/drivers/net/ethernet/micrel/ks8842.c index 822616e3c375..0c33b92a5a81 100644 --- a/drivers/net/ethernet/micrel/ks8842.c +++ b/drivers/net/ethernet/micrel/ks8842.c @@ -875,13 +875,11 @@ static void ks8842_stop_dma(struct ks8842_adapter *adapter) tx_ctl->adesc = NULL; if (tx_ctl->chan) - tx_ctl->chan->device->device_control(tx_ctl->chan, - DMA_TERMINATE_ALL, 0); + dmaengine_terminate_all(tx_ctl->chan); rx_ctl->adesc = NULL; if (rx_ctl->chan) - rx_ctl->chan->device->device_control(rx_ctl->chan, - DMA_TERMINATE_ALL, 0); + dmaengine_terminate_all(rx_ctl->chan); if (sg_dma_address(&rx_ctl->sg)) dma_unmap_single(adapter->dev, sg_dma_address(&rx_ctl->sg), |