From owner-p4-projects@FreeBSD.ORG  Sat Jun 13 21:45:38 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 284A31065673; Sat, 13 Jun 2009 21:45:37 +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 DB9521065670
	for <perforce@freebsd.org>; Sat, 13 Jun 2009 21:45:36 +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 CA3478FC16
	for <perforce@freebsd.org>; Sat, 13 Jun 2009 21:45:36 +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 n5DLjaJm080767
	for <perforce@freebsd.org>; Sat, 13 Jun 2009 21:45:36 GMT
	(envelope-from mav@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n5DLjYBg080764
	for perforce@freebsd.org; Sat, 13 Jun 2009 21:45:34 GMT
	(envelope-from mav@freebsd.org)
Date: Sat, 13 Jun 2009 21:45:34 GMT
Message-Id: <200906132145.n5DLjYBg080764@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 164298 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: Sat, 13 Jun 2009 21:45:39 -0000

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

Change 164298 by mav@mav_mavbook on 2009/06/13 21:44:42

	Fix copy/paste bug.

Affected files ...

.. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_xpt.c#18 edit

Differences ...

==== //depot/projects/scottl-camlock/src/sys/cam/ata/ata_xpt.c#18 (text+ko) ====

@@ -355,7 +355,7 @@
 		      MSG_SIMPLE_Q_TAG,
 		      /*data_ptr*/NULL,
 		      /*dxfer_len*/0,
-		      (done_ccb->ccb_h.target_id == 15 ? 3 : 15) * 1000);
+		      (start_ccb->ccb_h.target_id == 15 ? 3 : 15) * 1000);
 		ata_reset_cmd(ataio);
 		break;
 	case PROBE_IDENTIFY:
@@ -1029,7 +1029,7 @@
 				softc->pm_found |= (1 << softc->pm_step);
 				softc->pm_step++;
 			} else {
-				if (softc->pm_try < 50) {
+				if (softc->pm_try < 100) {
 					DELAY(10000);
 					softc->pm_try++;
 				} else