From owner-p4-projects@FreeBSD.ORG  Sun May 13 17:43:42 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 3DD6816A406; Sun, 13 May 2007 17:43:42 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id C7FFA16A403
	for <perforce@freebsd.org>; Sun, 13 May 2007 17:43:41 +0000 (UTC)
	(envelope-from mjacob@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id B94DB13C469
	for <perforce@freebsd.org>; Sun, 13 May 2007 17:43:41 +0000 (UTC)
	(envelope-from mjacob@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4DHhfUV016281
	for <perforce@freebsd.org>; Sun, 13 May 2007 17:43:41 GMT
	(envelope-from mjacob@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4DHhfWJ016275
	for perforce@freebsd.org; Sun, 13 May 2007 17:43:41 GMT
	(envelope-from mjacob@freebsd.org)
Date: Sun, 13 May 2007 17:43:41 GMT
Message-Id: <200705131743.l4DHhfWJ016275@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	mjacob@freebsd.org using -f
From: Matt Jacob <mjacob@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 119776 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: Sun, 13 May 2007 17:43:42 -0000

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

Change 119776 by mjacob@mjexp on 2007/05/13 17:43:07

	Temp workaround config_intrhook_establish running the hook right away.

Affected files ...

.. //depot/projects/mjexp/sys/dev/isp/isp_freebsd.c#26 edit

Differences ...

==== //depot/projects/mjexp/sys/dev/isp/isp_freebsd.c#26 (text+ko) ====

@@ -146,12 +146,15 @@
 
 	isp->isp_osinfo.ehook.ich_func = isp_intr_enable;
 	isp->isp_osinfo.ehook.ich_arg = isp;
+	ISP_UNLOCK(isp);
 	if (config_intrhook_establish(&isp->isp_osinfo.ehook) != 0) {
+		ISP_LOCK(isp);
 		cam_sim_free(sim, TRUE);
 		isp_prt(isp, ISP_LOGERR,
 		    "could not establish interrupt enable hook");
 		return;
 	}
+	ISP_LOCK(isp);
 
 	if (xpt_bus_register(sim, primary) != CAM_SUCCESS) {
 		cam_sim_free(sim, TRUE);