1 files changed, 6 insertions, 18 deletions

diff --git a/drivers/net/ethernet/aeroflex/greth.c b/drivers/net/ethernet/aeroflex/greth.c
index 0be2195e5034..269295403fc4 100644
--- a/drivers/net/ethernet/aeroflex/greth.c
+++ b/drivers/net/ethernet/aeroflex/greth.c
@@ -1464,35 +1464,23 @@ static int greth_of_probe(struct platform_device *ofdev)
         }
 
         /* Allocate TX descriptor ring in coherent memory */
-        greth->tx_bd_base = (struct greth_bd *) dma_alloc_coherent(greth->dev,
-                                                                   1024,
-                                                                   &greth->tx_bd_base_phys,
-                                                                   GFP_KERNEL);
-
+        greth->tx_bd_base = dma_alloc_coherent(greth->dev, 1024,
+                                               &greth->tx_bd_base_phys,
+                                               GFP_KERNEL | __GFP_ZERO);
         if (!greth->tx_bd_base) {
-                if (netif_msg_probe(greth))
-                        dev_err(&dev->dev, "could not allocate descriptor memory.\n");
                 err = -ENOMEM;
                 goto error3;
         }
 
-        memset(greth->tx_bd_base, 0, 1024);
-
         /* Allocate RX descriptor ring in coherent memory */
-        greth->rx_bd_base = (struct greth_bd *) dma_alloc_coherent(greth->dev,
-                                                                   1024,
-                                                                   &greth->rx_bd_base_phys,
-                                                                   GFP_KERNEL);
-
+        greth->rx_bd_base = dma_alloc_coherent(greth->dev, 1024,
+                                               &greth->rx_bd_base_phys,
+                                               GFP_KERNEL | __GFP_ZERO);
         if (!greth->rx_bd_base) {
-                if (netif_msg_probe(greth))
-                        dev_err(greth->dev, "could not allocate descriptor memory.\n");
                 err = -ENOMEM;
                 goto error4;
         }
 
-        memset(greth->rx_bd_base, 0, 1024);
-
         /* Get MAC address from: module param, OF property or ID prom */
         for (i = 0; i < 6; i++) {
                 if (macaddr[i] != 0)