From owner-p4-projects@FreeBSD.ORG  Mon Mar 31 07:14:08 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 49F4F1065672; Mon, 31 Mar 2008 07:14:08 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 096C2106564A
	for <perforce@freebsd.org>; Mon, 31 Mar 2008 07:14:08 +0000 (UTC)
	(envelope-from scottl@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 0924B8FC17
	for <perforce@freebsd.org>; Mon, 31 Mar 2008 07:14:08 +0000 (UTC)
	(envelope-from scottl@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2V7E7OI077063
	for <perforce@freebsd.org>; Mon, 31 Mar 2008 07:14:07 GMT
	(envelope-from scottl@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2V7E79A077061
	for perforce@freebsd.org; Mon, 31 Mar 2008 07:14:07 GMT
	(envelope-from scottl@freebsd.org)
Date: Mon, 31 Mar 2008 07:14:07 GMT
Message-Id: <200803310714.m2V7E79A077061@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	scottl@freebsd.org using -f
From: Scott Long <scottl@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 139040 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 31 Mar 2008 07:14:09 -0000

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

Change 139040 by scottl@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 */