diff --git a/sys/compat/ndis/kern_ndis.c b/sys/compat/ndis/kern_ndis.c
index 6e6fd60e5c5..fec7650d245 100644
--- a/sys/compat/ndis/kern_ndis.c
+++ b/sys/compat/ndis/kern_ndis.c
@@ -1122,6 +1122,7 @@ ndis_halt_nic(arg)
 		return(EIO);
 	}
 
+	sc->ndis_block->nmb_miniportadapterctx = NULL;
 	sc->ndis_block->nmb_devicectx = NULL;
 
 	/*
@@ -1135,10 +1136,6 @@ ndis_halt_nic(arg)
 
 	MSCALL1(haltfunc, adapter);
 
-	NDIS_LOCK(sc);
-	sc->ndis_block->nmb_miniportadapterctx = NULL;
-	NDIS_UNLOCK(sc);
-
 	return(0);
 }
 
diff --git a/sys/dev/if_ndis/if_ndis.c b/sys/dev/if_ndis/if_ndis.c
index 893a671f29f..45f11341570 100644
--- a/sys/dev/if_ndis/if_ndis.c
+++ b/sys/dev/if_ndis/if_ndis.c
@@ -2886,8 +2886,6 @@ ndis_80211_ioctl_set(struct ifnet *ifp, u_long command, caddr_t data)
 		error = copyin(ireq->i_data, &(ssid.ns_ssid), ireq->i_len);
 		if (error)
 			break;
-		device_printf(sc->ndis_dev,
-		    "setting SSID to %s\n", ssid.ns_ssid);
 		error = ndis_set_info(sc, OID_802_11_SSID, &ssid, &len);
 		if (error) {
 			device_printf(sc->ndis_dev,