--- sys/dev/wpi/if_wpi.c.orig	2007-08-29 21:24:18.706787265 +0200
+++ sys/dev/wpi/if_wpi.c	2007-08-29 21:30:52.175103490 +0200
@@ -1273,11 +1273,14 @@
 wpi_shutdown(device_t dev)
 {
 	struct wpi_softc *sc = device_get_softc(dev);
+	WPI_LOCK_DECL;
 
 	DPRINTFN(WPI_DEBUG_FUNC,("wpi_shutdown\n"));
 
 	wpi_stop(sc);
+	WPI_LOCK(sc);
 	wpi_unload_firmware(sc);
+	WPI_UNLOCK(sc);
 
 	return 0;
 }