From 51a4d18f0fa954ce229e15437623d63c9b36f568 Mon Sep 17 00:00:00 2001
From: mjacob <mjacob@NetBSD.org>
Date: Wed, 6 Oct 1999 05:01:05 +0000
Subject: [PATCH] If we're discovering, don't tsleep on lbolt if we had a busy
 status.

---
 sys/dev/scsipi/scsipi_base.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys/dev/scsipi/scsipi_base.c b/sys/dev/scsipi/scsipi_base.c
index 9de535399052..f5354f15aeee 100644
--- a/sys/dev/scsipi/scsipi_base.c
+++ b/sys/dev/scsipi/scsipi_base.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: scsipi_base.c,v 1.24 1999/09/30 22:57:54 thorpej Exp $	*/
+/*	$NetBSD: scsipi_base.c,v 1.25 1999/10/06 05:01:05 mjacob Exp $	*/
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -757,7 +757,7 @@ sc_err1(xs, async)
 		if (xs->retries) {
 			if ((xs->xs_control & XS_CTL_POLL) != 0)
 				delay(1000000);
-			else if ((xs->xs_control & XS_CTL_NOSLEEP) == 0)
+			else if ((xs->xs_control & (XS_CTL_NOSLEEP|XS_CTL_DISCOVERY)) == 0)
 				tsleep(&lbolt, PRIBIO, "scbusy", 0);
 			else
 #if 0