From owner-p4-projects@FreeBSD.ORG  Sun Jun 28 13:37:40 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id DE58610656DC; Sun, 28 Jun 2009 13:37:39 +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 9A63710656D9
	for <perforce@freebsd.org>; Sun, 28 Jun 2009 13:37:39 +0000 (UTC)
	(envelope-from mav@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 8834D8FC1D
	for <perforce@freebsd.org>; Sun, 28 Jun 2009 13:37:39 +0000 (UTC)
	(envelope-from mav@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n5SDbdNN023299
	for <perforce@freebsd.org>; Sun, 28 Jun 2009 13:37:39 GMT
	(envelope-from mav@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n5SDbdDd023297
	for perforce@freebsd.org; Sun, 28 Jun 2009 13:37:39 GMT
	(envelope-from mav@freebsd.org)
Date: Sun, 28 Jun 2009 13:37:39 GMT
Message-Id: <200906281337.n5SDbdDd023297@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	mav@freebsd.org using -f
From: Alexander Motin <mav@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 165346 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, 28 Jun 2009 13:37:41 -0000

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

Change 165346 by mav@mav_mavbook on 2009/06/28 13:37:33

	Do not drop the lock at the end of atapi_action() on error.
	It is the real reason of crash when ATA XPT tried to scan this
	emulated SPI bus.

Affected files ...

.. //depot/projects/scottl-camlock/src/sys/dev/ata/atapi-cam.c#16 edit

Differences ...

==== //depot/projects/scottl-camlock/src/sys/dev/ata/atapi-cam.c#16 (text+ko) ====

@@ -666,13 +666,11 @@
     xpt_freeze_simq(sim, /*count*/ 1);
     ccb_h->status = CAM_REQUEUE_REQ;
     xpt_done(ccb);
-    mtx_unlock(&softc->state_lock);
     return;
 
 action_invalid:
     ccb_h->status = CAM_REQ_INVALID;
     xpt_done(ccb);
-    mtx_unlock(&softc->state_lock);
     return;
 }