From 6ba823115e6ee826fe3befe927a75a56469c1c55 Mon Sep 17 00:00:00 2001
From: Matt Jacob <mjacob@FreeBSD.org>
Date: Sun, 15 Aug 1999 23:34:40 +0000
Subject: Move initialization of announce_buf up to make sure it is initialized
 in all cases.

---
 sys/cam/scsi/scsi_da.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'sys/cam')

diff --git a/sys/cam/scsi/scsi_da.c b/sys/cam/scsi/scsi_da.c
index ca36b3c40214..b23a35d55bf5 100644
--- a/sys/cam/scsi/scsi_da.c
+++ b/sys/cam/scsi/scsi_da.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: scsi_da.c,v 1.31 1999/08/09 10:34:30 phk Exp $
+ *      $Id: scsi_da.c,v 1.32 1999/08/14 11:40:31 phk Exp $
  */
 
 #include "opt_hw_wdog.h"
@@ -1315,6 +1315,8 @@ dadone(struct cam_periph *periph, union ccb *done_ccb)
 		} else {
 			int	error;
 
+			announce_buf[0] = '\0';
+
 			/*
 			 * Retry any UNIT ATTENTION type errors.  They
 			 * are expected at boot.
@@ -1396,7 +1398,6 @@ dadone(struct cam_periph *periph, union ccb *done_ccb)
 					 * Free up resources.
 					 */
 					cam_periph_invalidate(periph);
-					announce_buf[0] = '\0';
 				} 
 			}
 		}
-- 
cgit v1.2.3