diff options
Diffstat (limited to 'drivers/dma/xilinx/xilinx_dma.c')
| -rw-r--r-- | drivers/dma/xilinx/xilinx_dma.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/dma/xilinx/xilinx_dma.c b/drivers/dma/xilinx/xilinx_dma.c index 02880963092f..cb20b411493e 100644 --- a/drivers/dma/xilinx/xilinx_dma.c +++ b/drivers/dma/xilinx/xilinx_dma.c | |||
| @@ -879,10 +879,9 @@ static int xilinx_dma_alloc_chan_resources(struct dma_chan *dchan) | |||
| 879 | */ | 879 | */ |
| 880 | if (chan->xdev->dma_config->dmatype == XDMA_TYPE_AXIDMA) { | 880 | if (chan->xdev->dma_config->dmatype == XDMA_TYPE_AXIDMA) { |
| 881 | /* Allocate the buffer descriptors. */ | 881 | /* Allocate the buffer descriptors. */ |
| 882 | chan->seg_v = dma_zalloc_coherent(chan->dev, | 882 | chan->seg_v = dma_alloc_coherent(chan->dev, |
| 883 | sizeof(*chan->seg_v) * | 883 | sizeof(*chan->seg_v) * XILINX_DMA_NUM_DESCS, |
| 884 | XILINX_DMA_NUM_DESCS, | 884 | &chan->seg_p, GFP_KERNEL); |
| 885 | &chan->seg_p, GFP_KERNEL); | ||
| 886 | if (!chan->seg_v) { | 885 | if (!chan->seg_v) { |
| 887 | dev_err(chan->dev, | 886 | dev_err(chan->dev, |
| 888 | "unable to allocate channel %d descriptors\n", | 887 | "unable to allocate channel %d descriptors\n", |
| @@ -895,9 +894,10 @@ static int xilinx_dma_alloc_chan_resources(struct dma_chan *dchan) | |||
| 895 | * so allocating a desc segment during channel allocation for | 894 | * so allocating a desc segment during channel allocation for |
| 896 | * programming tail descriptor. | 895 | * programming tail descriptor. |
| 897 | */ | 896 | */ |
| 898 | chan->cyclic_seg_v = dma_zalloc_coherent(chan->dev, | 897 | chan->cyclic_seg_v = dma_alloc_coherent(chan->dev, |
| 899 | sizeof(*chan->cyclic_seg_v), | 898 | sizeof(*chan->cyclic_seg_v), |
| 900 | &chan->cyclic_seg_p, GFP_KERNEL); | 899 | &chan->cyclic_seg_p, |
| 900 | GFP_KERNEL); | ||
| 901 | if (!chan->cyclic_seg_v) { | 901 | if (!chan->cyclic_seg_v) { |
| 902 | dev_err(chan->dev, | 902 | dev_err(chan->dev, |
| 903 | "unable to allocate desc segment for cyclic DMA\n"); | 903 | "unable to allocate desc segment for cyclic DMA\n"); |
