qede: avoid uninitialized entries in coal_entry array

[tomoyo/tomoyo-test1.git] / drivers / net / ethernet / qlogic / qede / qede_main.c

diff --git a/drivers/net/ethernet/qlogic/qede/qede_main.c b/drivers/net/ethernet/qlogic/qede/qede_main.c
index 4a3c3b5..261f982 100644 (file)
--- a/drivers/net/ethernet/qlogic/qede/qede_main.c
+++ b/drivers/net/ethernet/qlogic/qede/qede_main.c
@@ -963,7 +963,6 @@ static int qede_alloc_fp_array(struct qede_dev *edev)
 {
        u8 fp_combined, fp_rx = edev->fp_num_rx;
        struct qede_fastpath *fp;
-       void *mem;
        int i;
 
        edev->fp_array = kcalloc(QEDE_QUEUE_CNT(edev),
@@ -974,20 +973,14 @@ static int qede_alloc_fp_array(struct qede_dev *edev)
        }
 
        if (!edev->coal_entry) {
-               mem = kcalloc(QEDE_MAX_RSS_CNT(edev),
-                             sizeof(*edev->coal_entry), GFP_KERNEL);
-       } else {
-               mem = krealloc(edev->coal_entry,
-                              QEDE_QUEUE_CNT(edev) * sizeof(*edev->coal_entry),
-                              GFP_KERNEL);
-       }
-
-       if (!mem) {
-               DP_ERR(edev, "coalesce entry allocation failed\n");
-               kfree(edev->coal_entry);
-               goto err;
+               edev->coal_entry = kcalloc(QEDE_MAX_RSS_CNT(edev),
+                                          sizeof(*edev->coal_entry),
+                                          GFP_KERNEL);
+               if (!edev->coal_entry) {
+                       DP_ERR(edev, "coalesce entry allocation failed\n");
+                       goto err;
+               }
        }
-       edev->coal_entry = mem;
 
        fp_combined = QEDE_QUEUE_CNT(edev) - fp_rx - edev->fp_num_tx;