PERFORCE change 139040 for review

[Scott Long]

http://perforce.freebsd.org/chv.cgi?CH=139040

Change 139040 by scottl at scottl-deimos on 2008/03/31 07:13:43

	Merge cam_xpt.c#80,#81 (rev 1.195, 1.196)

Affected files ...

.. //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#76 integrate

Differences ...

==== //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#76 (text+ko) ====

@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.194 2008/01/28 18:13:03 brueffer Exp $");
+__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.196 2008/02/26 08:09:29 scottl Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -587,6 +587,7 @@
 					    inccb->ccb_h.target_lun) !=
 					    CAM_REQ_CMP){
 				error = EINVAL;
+				CAM_SIM_UNLOCK(bus->sim);
 				break;
 			}
 			/* Ensure all of our fields are correct */