Module Name: src
Committed By: jakllsch
Date: Sun Jul 15 15:49:46 UTC 2012
Modified Files:
src/sys/dev/ata: ata.c
Log Message:
Stopgap crash prevention when atadebug_mask includes DEBUG_PROBE bit.
To generate a diff of this commit:
cvs rdiff -u -r1.118 -r1.119 src/sys/dev/ata/ata.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/ata/ata.c
diff -u src/sys/dev/ata/ata.c:1.118 src/sys/dev/ata/ata.c:1.119
--- src/sys/dev/ata/ata.c:1.118 Sun Jul 15 10:55:29 2012
+++ src/sys/dev/ata/ata.c Sun Jul 15 15:49:46 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: ata.c,v 1.118 2012/07/15 10:55:29 dsl Exp $ */
+/* $NetBSD: ata.c,v 1.119 2012/07/15 15:49:46 jakllsch Exp $ */
/*
* Copyright (c) 1998, 2001 Manuel Bouyer. All rights reserved.
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ata.c,v 1.118 2012/07/15 10:55:29 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ata.c,v 1.119 2012/07/15 15:49:46 jakllsch Exp $");
#include "opt_ata.h"
@@ -212,9 +212,11 @@ atabusconfig(struct atabus_softc *atabus
if (chp->ch_satapmp_nports == 0)
(*atac->atac_probe)(chp);
- ATADEBUG_PRINT(("atabusattach: ch_drive_type 0x%x 0x%x\n",
- chp->ch_drive[0].drive_type, chp->ch_drive[1].drive_type),
- DEBUG_PROBE);
+ if (chp->ch_drive != NULL && chp->ch_ndrives >= 1) {
+ ATADEBUG_PRINT(("atabusattach: ch_drive_type 0x%x 0x%x\n",
+ chp->ch_drive[0].drive_type, chp->ch_drive[1].drive_type),
+ DEBUG_PROBE);
+ }
/* next operations will occurs in a separate thread */
s = splbio();
