fix: cleanup order

robert-burger · Aug 26, 2024 · 2176dbf · 2176dbf
1 parent f8056c5
commit 2176dbf
Showing 1 changed file with 8 additions and 9 deletions.
diff --git a/src/ec.c b/src/ec.c
@@ -1179,19 +1179,11 @@ int ec_open(ec_t *pec, struct hw_common *phw, int eeprom_log) {
 int ec_close(ec_t *pec) {
     assert(pec != NULL);
 
-    ec_log(10, "MASTER_CLOSE", "detroying tun device...\n");
-
 #if LIBETHERCAT_MBX_SUPPORT_EOE == 1
+    ec_log(10, "MASTER_CLOSE", "detroying tun device...\n");
     ec_eoe_destroy_tun(pec);
 #endif
 
-    ec_log(10, "MASTER_CLOSE", "destroying async loop\n");
-    (void)ec_async_loop_destroy(&pec->async_loop);
-    ec_log(10, "MASTER_CLOSE", "closing hardware handle\n");
-    (void)hw_close(pec->phw);
-    ec_log(10, "MASTER_CLOSE", "freeing frame pool\n");
-    (void)pool_close(&pec->pool);
-
     ec_log(10, "MASTER_CLOSE", "destroying pd_groups\n");
     ec_index_deinit(&pec->idx_q);
     (void)ec_destroy_pd_groups(pec);
@@ -1206,6 +1198,13 @@ int ec_close(ec_t *pec) {
 
     pec->slave_cnt = 0;
 
+    ec_log(10, "MASTER_CLOSE", "destroying async loop\n");
+    (void)ec_async_loop_destroy(&pec->async_loop);
+    ec_log(10, "MASTER_CLOSE", "closing hardware handle\n");
+    (void)hw_close(pec->phw);
+    ec_log(10, "MASTER_CLOSE", "freeing frame pool\n");
+    (void)pool_close(&pec->pool);
+
     (void)pool_close(&pec->mbx_message_pool_recv_free);
     (void)pool_close(&pec->mbx_message_pool_send_free);