From owner-svn-src-head@FreeBSD.ORG  Thu May  2 14:19:43 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 1308C145;
 Thu,  2 May 2013 14:19:43 +0000 (UTC) (envelope-from smh@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 0472F1F6F;
 Thu,  2 May 2013 14:19:43 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r42EJg1u078502;
 Thu, 2 May 2013 14:19:42 GMT (envelope-from smh@svn.freebsd.org)
Received: (from smh@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r42EJgT9078501;
 Thu, 2 May 2013 14:19:42 GMT (envelope-from smh@svn.freebsd.org)
Message-Id: <201305021419.r42EJgT9078501@svn.freebsd.org>
From: Steven Hartland <smh@FreeBSD.org>
Date: Thu, 2 May 2013 14:19:42 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r250180 - head/sys/cam/scsi
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 02 May 2013 14:19:43 -0000

Author: smh
Date: Thu May  2 14:19:42 2013
New Revision: 250180
URL: http://svnweb.freebsd.org/changeset/base/250180

Log:
  Fix probe in progress check in dareprobe
  
  Reviewed by:	mav
  Approved by:	pjd (mentor)
  MFC after:	1 week

Modified:
  head/sys/cam/scsi/scsi_da.c

Modified: head/sys/cam/scsi/scsi_da.c
==============================================================================
--- head/sys/cam/scsi/scsi_da.c	Thu May  2 14:14:57 2013	(r250179)
+++ head/sys/cam/scsi/scsi_da.c	Thu May  2 14:19:42 2013	(r250180)
@@ -3200,7 +3200,7 @@ dareprobe(struct cam_periph *periph)
 	softc = (struct da_softc *)periph->softc;
 
 	/* Probe in progress; don't interfere. */
-	if ((softc->flags & DA_FLAG_PROBED) == 0)
+	if (softc->state != DA_STATE_NORMAL)
 		return;
 
 	status = cam_periph_acquire(periph);