Merge tag 'for-f2fs-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk...

[deliverable/linux.git] / drivers / dma / fsldma.c

diff --git a/drivers/dma/fsldma.c b/drivers/dma/fsldma.c
index aac85c30c2cf6fc64669841c5b6abb5317df1b94..a8828ed639b3027c476fc7d82d4d6607221b2ae1 100644 (file)
--- a/drivers/dma/fsldma.c
+++ b/drivers/dma/fsldma.c
@@ -462,13 +462,12 @@ static struct fsl_desc_sw *fsl_dma_alloc_descriptor(struct fsldma_chan *chan)
        struct fsl_desc_sw *desc;
        dma_addr_t pdesc;
 
-       desc = dma_pool_alloc(chan->desc_pool, GFP_ATOMIC, &pdesc);
+       desc = dma_pool_zalloc(chan->desc_pool, GFP_ATOMIC, &pdesc);
        if (!desc) {
                chan_dbg(chan, "out of memory for link descriptor\n");
                return NULL;
        }
 
-       memset(desc, 0, sizeof(*desc));
        INIT_LIST_HEAD(&desc->tx_list);
        dma_async_tx_descriptor_init(&desc->async_tx, &chan->common);
        desc->async_tx.tx_submit = fsl_dma_tx_submit;