Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[firefly-linux-kernel-4.4.55.git] / drivers / net / ethernet / faraday / ftmac100.c

diff --git a/drivers/net/ethernet/faraday/ftmac100.c b/drivers/net/ethernet/faraday/ftmac100.c
index b5ea8fbd8a76d19597714b8e35772e9037647a86..a6eda8d83138bd791769ba9e45bccf5c1f88c00e 100644 (file)
--- a/drivers/net/ethernet/faraday/ftmac100.c
+++ b/drivers/net/ethernet/faraday/ftmac100.c
@@ -732,13 +732,13 @@ static int ftmac100_alloc_buffers(struct ftmac100 *priv)
 {
        int i;
 
-       priv->descs = dma_alloc_coherent(priv->dev, sizeof(struct ftmac100_descs),
-                                        &priv->descs_dma_addr, GFP_KERNEL);
+       priv->descs = dma_alloc_coherent(priv->dev,
+                                        sizeof(struct ftmac100_descs),
+                                        &priv->descs_dma_addr,
+                                        GFP_KERNEL | __GFP_ZERO);
        if (!priv->descs)
                return -ENOMEM;
 
-       memset(priv->descs, 0, sizeof(struct ftmac100_descs));
-
        /* initialize RX ring */
        ftmac100_rxdes_set_end_of_ring(&priv->descs->rxdes[RX_QUEUE_ENTRIES - 1]);