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

[firefly-linux-kernel-4.4.55.git] / drivers / net / fddi / defxx.c

diff --git a/drivers/net/fddi/defxx.c b/drivers/net/fddi/defxx.c
index 502c8ff1d985b80dd96423040e54fc54dedabaeb..4c8ddc944d51f5d412b85bdbd8a29413512b9878 100644 (file)
--- a/drivers/net/fddi/defxx.c
+++ b/drivers/net/fddi/defxx.c
@@ -1070,13 +1070,10 @@ static int dfx_driver_init(struct net_device *dev, const char *print_name,
                                        (PI_ALIGN_K_DESC_BLK - 1);
        bp->kmalloced = top_v = dma_alloc_coherent(bp->bus_dev, alloc_size,
                                                   &bp->kmalloced_dma,
-                                                  GFP_ATOMIC);
-       if (top_v == NULL) {
-               printk("%s: Could not allocate memory for host buffers "
-                      "and structures!\n", print_name);
+                                                  GFP_ATOMIC | __GFP_ZERO);
+       if (top_v == NULL)
                return DFX_K_FAILURE;
-       }
-       memset(top_v, 0, alloc_size);   /* zero out memory before continuing */
+
        top_p = bp->kmalloced_dma;      /* get physical address of buffer */
 
        /*