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

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

diff --git a/drivers/dma/k3dma.c b/drivers/dma/k3dma.c
index aabcb7934b05084bb9509beeff78abe74e5a6202..01e25c68dd5a0478eaecf5d8b5cdd9c7bc2b9b4c 100644 (file)
--- a/drivers/dma/k3dma.c
+++ b/drivers/dma/k3dma.c
@@ -458,13 +458,12 @@ static struct k3_dma_desc_sw *k3_dma_alloc_desc_resource(int num,
        if (!ds)
                return NULL;
 
-       ds->desc_hw = dma_pool_alloc(d->pool, GFP_NOWAIT, &ds->desc_hw_lli);
+       ds->desc_hw = dma_pool_zalloc(d->pool, GFP_NOWAIT, &ds->desc_hw_lli);
        if (!ds->desc_hw) {
                dev_dbg(chan->device->dev, "vch %p: dma alloc fail\n", &c->vc);
                kfree(ds);
                return NULL;
        }
-       memset(ds->desc_hw, 0, sizeof(struct k3_desc_hw) * num);
        ds->desc_num = num;
        return ds;
 }