Module Name: src
Committed By: bouyer
Date: Sat Aug 4 21:21:10 UTC 2012
Modified Files:
src/sys/dev/ata: ata.c
Log Message:
If ch_ndrives is > 0, then ch_drive is not supposed to be NULL.
To generate a diff of this commit:
cvs rdiff -u -r1.124 -r1.125 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.124 src/sys/dev/ata/ata.c:1.125
--- src/sys/dev/ata/ata.c:1.124 Tue Jul 31 15:50:34 2012
+++ src/sys/dev/ata/ata.c Sat Aug 4 21:21:09 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: ata.c,v 1.124 2012/07/31 15:50:34 bouyer Exp $ */
+/* $NetBSD: ata.c,v 1.125 2012/08/04 21:21:09 bouyer 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.124 2012/07/31 15:50:34 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ata.c,v 1.125 2012/08/04 21:21:09 bouyer Exp $");
#include "opt_ata.h"
@@ -212,7 +212,7 @@ atabusconfig(struct atabus_softc *atabus
if (chp->ch_satapmp_nports == 0)
(*atac->atac_probe)(chp);
- if (chp->ch_drive != NULL && chp->ch_ndrives >= 2) {
+ if (chp->ch_ndrives >= 2) {
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);
