Index: sys/net/iflib.c
===================================================================
--- sys/net/iflib.c
+++ sys/net/iflib.c
@@ -4287,11 +4287,8 @@
 	ctx->ifc_softc = sc;
 
 	if ((err = iflib_register(ctx)) != 0) {
-		if (ctx->ifc_flags & IFC_SC_ALLOCATED)
-			free(sc, M_IFLIB);
-		free(ctx, M_IFLIB);
 		device_printf(dev, "iflib_register failed %d\n", err);
-		return (err);
+		goto fail_early;
 	}
 	iflib_add_device_sysctl_pre(ctx);
 
@@ -4301,9 +4298,8 @@
 	iflib_reset_qvalues(ctx);
 	CTX_LOCK(ctx);
 	if ((err = IFDI_ATTACH_PRE(ctx)) != 0) {
-		CTX_UNLOCK(ctx);
 		device_printf(dev, "IFDI_ATTACH_PRE failed %d\n", err);
-		return (err);
+		goto fail_unlock;
 	}
 	_iflib_pre_assert(scctx);
 	ctx->ifc_txrx = *scctx->isc_txrx;
@@ -4333,7 +4329,7 @@
 			/* round down instead? */
 			device_printf(dev, "# rx descriptors must be a power of 2\n");
 			err = EINVAL;
-			goto fail;
+			goto fail_iflib_detach;
 		}
 	}
 	for (i = 0; i < sctx->isc_ntxqs; i++) {
@@ -4341,7 +4337,7 @@
 			device_printf(dev,
 			    "# tx descriptors must be a power of 2");
 			err = EINVAL;
-			goto fail;
+			goto fail_iflib_detach;
 		}
 	}
 
@@ -4411,7 +4407,7 @@
 	/* Get memory for the station queues */
 	if ((err = iflib_queues_alloc(ctx))) {
 		device_printf(dev, "Unable to allocate queue memory\n");
-		goto fail;
+		goto fail_intr_free;
 	}
 
 	if ((err = iflib_qset_structures_setup(ctx)))
@@ -4430,7 +4426,7 @@
 	IFDI_INTR_DISABLE(ctx);
 	if (msix > 1 && (err = IFDI_MSIX_INTR_ASSIGN(ctx, msix)) != 0) {
 		device_printf(dev, "IFDI_MSIX_INTR_ASSIGN failed %d\n", err);
-		goto fail_intr_free;
+		goto fail_queues;
 	}
 	if (msix <= 1) {
 		rid = 0;
@@ -4440,7 +4436,7 @@
 		}
 		if ((err = iflib_legacy_setup(ctx, ctx->isc_legacy_intr, ctx->ifc_softc, &rid, "irq0")) != 0) {
 			device_printf(dev, "iflib_legacy_setup failed %d\n", err);
-			goto fail_intr_free;
+			goto fail_queues;
 		}
 	}
 
@@ -4476,14 +4472,18 @@
 fail_detach:
 	ether_ifdetach(ctx->ifc_ifp);
 fail_intr_free:
+	iflib_free_intr_mem(ctx);
 fail_queues:
 	iflib_tx_structures_free(ctx);
 	iflib_rx_structures_free(ctx);
-fail:
-	iflib_free_intr_mem(ctx);
+fail_iflib_detach:
 	IFDI_DETACH(ctx);
+fail_unlock:
 	CTX_UNLOCK(ctx);
-
+fail_early:
+        if (ctx->ifc_flags & IFC_SC_ALLOCATED)
+                free(ctx->ifc_softc, M_IFLIB);
+        free(ctx, M_IFLIB);
 	return (err);
 }
 
@@ -4512,9 +4512,7 @@
 
 	if ((err = iflib_register(ctx)) != 0) {
 		device_printf(dev, "%s: iflib_register failed %d\n", __func__, err);
-		free(sc, M_IFLIB);
-		free(ctx, M_IFLIB);
-		return (err);
+		goto fail;
 	}
 	iflib_add_device_sysctl_pre(ctx);
 
@@ -4528,14 +4526,14 @@
 
 	if ((err = IFDI_ATTACH_PRE(ctx)) != 0) {
 		device_printf(dev, "IFDI_ATTACH_PRE failed %d\n", err);
-		return (err);
+		goto fail;
 	}
 	if (sctx->isc_flags & IFLIB_GEN_MAC)
 		iflib_gen_mac(ctx);
 	if ((err = IFDI_CLONEATTACH(ctx, clctx->cc_ifc, clctx->cc_name,
 								clctx->cc_params)) != 0) {
 		device_printf(dev, "IFDI_CLONEATTACH failed %d\n", err);
-		return (err);
+		goto fail;
 	}
 	ifmedia_add(&ctx->ifc_media, IFM_ETHER | IFM_1000_T | IFM_FDX, 0, NULL);
 	ifmedia_add(&ctx->ifc_media, IFM_ETHER | IFM_AUTO, 0, NULL);
@@ -4593,7 +4591,7 @@
 			/* round down instead? */
 			device_printf(dev, "# rx descriptors must be a power of 2\n");
 			err = EINVAL;
-			goto fail;
+			goto fail_iflib_detach;
 		}
 	}
 	for (i = 0; i < sctx->isc_ntxqs; i++) {
@@ -4601,7 +4599,7 @@
 			device_printf(dev,
 			    "# tx descriptors must be a power of 2");
 			err = EINVAL;
-			goto fail;
+			goto fail_iflib_detach;
 		}
 	}
 
@@ -4647,7 +4645,7 @@
 	/* Get memory for the station queues */
 	if ((err = iflib_queues_alloc(ctx))) {
 		device_printf(dev, "Unable to allocate queue memory\n");
-		goto fail;
+		goto fail_iflib_detach;
 	}
 
 	if ((err = iflib_qset_structures_setup(ctx))) {
@@ -4687,8 +4685,11 @@
 fail_queues:
 	iflib_tx_structures_free(ctx);
 	iflib_rx_structures_free(ctx);
-fail:
+fail_iflib_detach:
 	IFDI_DETACH(ctx);
+fail:
+	free(ctx->ifc_softc, M_IFLIB);
+	free(ctx, M_IFLIB);
 	return (err);
 }