Merge branch 'for-linus-4.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[karo-tx-linux.git] / drivers / dma / at_hdmac.c

diff --git a/drivers/dma/at_hdmac.c b/drivers/dma/at_hdmac.c
index a4c8f80db29d44daaa940690b73a84c21b970054..1baf3404a3658533a27d1d85bb02742abdad3ad0 100644 (file)
--- a/drivers/dma/at_hdmac.c
+++ b/drivers/dma/at_hdmac.c
@@ -111,9 +111,8 @@ static struct at_desc *atc_alloc_descriptor(struct dma_chan *chan,
        struct at_dma   *atdma = to_at_dma(chan->device);
        dma_addr_t phys;
 
-       desc = dma_pool_alloc(atdma->dma_desc_pool, gfp_flags, &phys);
+       desc = dma_pool_zalloc(atdma->dma_desc_pool, gfp_flags, &phys);
        if (desc) {
-               memset(desc, 0, sizeof(struct at_desc));
                INIT_LIST_HEAD(&desc->tx_list);
                dma_async_tx_descriptor_init(&desc->txd, chan);
                /* txd.flags will be overwritten in prep functions */