Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/dev/ata If ch_ndrives is > 0, then ch_drive is not suppo...



details:   https://anonhg.NetBSD.org/src/rev/cca4d6f483a6
branches:  trunk
changeset: 780727:cca4d6f483a6
user:      bouyer <bouyer%NetBSD.org@localhost>
date:      Sat Aug 04 21:21:09 2012 +0000

description:
If ch_ndrives is > 0, then ch_drive is not supposed to be NULL.

diffstat:

 sys/dev/ata/ata.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r f7d2781b23c5 -r cca4d6f483a6 sys/dev/ata/ata.c
--- a/sys/dev/ata/ata.c Sat Aug 04 19:48:24 2012 +0000
+++ b/sys/dev/ata/ata.c Sat Aug 04 21:21:09 2012 +0000
@@ -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 @@
        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);



Home | Main Index | Thread Index | Old Index