1 files changed, 5 insertions, 10 deletions

diff --git a/drivers/net/ethernet/tundra/tsi108_eth.c b/drivers/net/ethernet/tundra/tsi108_eth.c
index 99fe3c6eea31..3c69a0460832 100644
--- a/drivers/net/ethernet/tundra/tsi108_eth.c
+++ b/drivers/net/ethernet/tundra/tsi108_eth.c
@@ -1308,21 +1308,16 @@ static int tsi108_open(struct net_device *dev)
                        data->id, dev->irq, dev->name);
         }
 
-        data->rxring = dma_alloc_coherent(NULL, rxring_size,
-                                          &data->rxdma, GFP_KERNEL);
-        if (!data->rxring) {
+        data->rxring = dma_alloc_coherent(NULL, rxring_size, &data->rxdma,
+                                          GFP_KERNEL | __GFP_ZERO);
+        if (!data->rxring)
                 return -ENOMEM;
-        } else {
-                memset(data->rxring, 0, rxring_size);
-        }
 
-        data->txring = dma_alloc_coherent(NULL, txring_size,
-                                          &data->txdma, GFP_KERNEL);
+        data->txring = dma_alloc_coherent(NULL, txring_size, &data->txdma,
+                                          GFP_KERNEL | __GFP_ZERO);
         if (!data->txring) {
                 pci_free_consistent(0, rxring_size, data->rxring, data->rxdma);
                 return -ENOMEM;
-        } else {
-                memset(data->txring, 0, txring_size);
         }
 
         for (i = 0; i < TSI108_RXRING_LEN; i++) {