Merge branch 'for-3.17' of git://linux-nfs.org/~bfields/linux

[firefly-linux-kernel-4.4.55.git] / sound / sparc / dbri.c

diff --git a/sound/sparc/dbri.c b/sound/sparc/dbri.c
index be1b1aa96b7ea2bd44d8ab0021a86eacb48a10e8..b2c3d0d5dca3284f5a4aad26761a2650a88814e0 100644 (file)
--- a/sound/sparc/dbri.c
+++ b/sound/sparc/dbri.c
@@ -2534,12 +2534,10 @@ static int snd_dbri_create(struct snd_card *card,
        dbri->op = op;
        dbri->irq = irq;
 
-       dbri->dma = dma_alloc_coherent(&op->dev,
-                                      sizeof(struct dbri_dma),
-                                      &dbri->dma_dvma, GFP_ATOMIC);
+       dbri->dma = dma_zalloc_coherent(&op->dev, sizeof(struct dbri_dma),
+                                       &dbri->dma_dvma, GFP_ATOMIC);
        if (!dbri->dma)
                return -ENOMEM;
-       memset((void *)dbri->dma, 0, sizeof(struct dbri_dma));
 
        dprintk(D_GEN, "DMA Cmd Block 0x%p (0x%08x)\n",
                dbri->dma, dbri->dma_dvma);