X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;ds=sidebyside;f=drivers%2Fevent%2Fopdl%2Fopdl_test.c;h=e7a32fbd31c24cd8b34b379c62444b4ff0e66f9c;hb=a0bfe9d56f746c749ff4cf275e88469fd952b01c;hp=13d4f6b4580edc1fa546306be5be49ac4ee308b0;hpb=be455196d4bb64c4fc681eddf9d2bd6aef2d9bee;p=dpdk.git

diff --git a/drivers/event/opdl/opdl_test.c b/drivers/event/opdl/opdl_test.c
index 13d4f6b458..e7a32fbd31 100644
--- a/drivers/event/opdl/opdl_test.c
+++ b/drivers/event/opdl/opdl_test.c
@@ -1,6 +1,5 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2010-2014 Intel Corporation
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2017 Intel Corporation
  */
 
 #include <stdio.h>
@@ -562,7 +561,6 @@ single_link_w_stats(struct test *t)
 	uint32_t deq_pkts;
 	struct rte_mbuf *mbufs[3];
 	RTE_SET_USED(mbufs);
-	RTE_SET_USED(i);
 
 	/* Create instance with 3 ports */
 	if (init(t, 2, tx_port + 1) < 0 ||
@@ -697,15 +695,10 @@ single_link_w_stats(struct test *t)
 static int
 single_link(struct test *t)
 {
-	/* const uint8_t rx_port = 0; */
-	/* const uint8_t w1_port = 1; */
-	/* const uint8_t w3_port = 3; */
 	const uint8_t tx_port = 2;
 	int err;
-	int i;
 	struct rte_mbuf *mbufs[3];
 	RTE_SET_USED(mbufs);
-	RTE_SET_USED(i);
 
 	/* Create instance with 5 ports */
 	if (init(t, 2, tx_port+1) < 0 ||
@@ -1004,11 +997,13 @@ opdl_selftest(void)
 		/* turn on stats by default */
 		if (rte_vdev_init(eventdev_name, "do_validation=1") < 0) {
 			PMD_DRV_LOG(ERR, "Error creating eventdev\n");
+			free(t);
 			return -1;
 		}
 		evdev = rte_event_dev_get_dev_id(eventdev_name);
 		if (evdev < 0) {
 			PMD_DRV_LOG(ERR, "Error finding newly created eventdev\n");
+			free(t);
 			return -1;
 		}
 	}
@@ -1024,6 +1019,7 @@ opdl_selftest(void)
 				rte_socket_id());
 		if (!eventdev_func_mempool) {
 			PMD_DRV_LOG(ERR, "ERROR creating mempool\n");
+			free(t);
 			return -1;
 		}
 	}
@@ -1046,9 +1042,9 @@ opdl_selftest(void)
 	ret = single_link_w_stats(t);
 
 	/*
-	 * Free test instance, leaving mempool initialized, and a pointer to it
-	 * in static eventdev_func_mempool, as it is re-used on re-runs
+	 * Free test instance, free  mempool
 	 */
+	rte_mempool_free(t->mbuf_pool);
 	free(t);
 
 	if (ret != 0)