svn commit: r205932 - head/sys/dev/mpt

[Matt Jacob]

Author: mjacob
Date: Tue Mar 30 20:39:57 2010
New Revision: 205932
URL: http://svn.freebsd.org/changeset/base/205932

Log:
  nit: xpt_bus_deregister has to be called with the sim lock held.
  
  MFC after:	1 month

Modified:
  head/sys/dev/mpt/mpt_cam.c

Modified: head/sys/dev/mpt/mpt_cam.c
==============================================================================
--- head/sys/dev/mpt/mpt_cam.c	Tue Mar 30 20:39:48 2010	(r205931)
+++ head/sys/dev/mpt/mpt_cam.c	Tue Mar 30 20:39:57 2010	(r205932)
@@ -1208,14 +1208,18 @@ mpt_cam_detach(struct mpt_softc *mpt)
 
 	if (mpt->sim != NULL) {
 		xpt_free_path(mpt->path);
+		MPT_LOCK(mpt);
 		xpt_bus_deregister(cam_sim_path(mpt->sim));
+		MPT_UNLOCK(mpt);
 		cam_sim_free(mpt->sim, TRUE);
 		mpt->sim = NULL;
 	}
 
 	if (mpt->phydisk_sim != NULL) {
 		xpt_free_path(mpt->phydisk_path);
+		MPT_LOCK(mpt);
 		xpt_bus_deregister(cam_sim_path(mpt->phydisk_sim));
+		MPT_UNLOCK(mpt);
 		cam_sim_free(mpt->phydisk_sim, TRUE);
 		mpt->phydisk_sim = NULL;
 	}