[src/trunk]: src/sys/dev/cardbus Make the driver work even if DIAGNOSTIC is n...

[augustss <augustss%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/595d52215088
branches:  trunk
changeset: 481733:595d52215088
user:      augustss <augustss%NetBSD.org@localhost>
date:      Fri Feb 04 13:43:56 2000 +0000

description:
Make the driver work even if DIAGNOSTIC is not set.

diffstat:

 sys/dev/cardbus/if_tlp_cardbus.c |  11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

diffs (35 lines):

diff -r d5ce4528c4af -r 595d52215088 sys/dev/cardbus/if_tlp_cardbus.c
--- a/sys/dev/cardbus/if_tlp_cardbus.c  Fri Feb 04 13:16:22 2000 +0000
+++ b/sys/dev/cardbus/if_tlp_cardbus.c  Fri Feb 04 13:43:56 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_tlp_cardbus.c,v 1.12 2000/02/04 07:59:20 haya Exp $ */
+/*     $NetBSD: if_tlp_cardbus.c,v 1.13 2000/02/04 13:43:56 augustss Exp $     */
 
 /*-
  * Copyright (c) 1999, 2000 The NetBSD Foundation, Inc.
@@ -440,12 +440,12 @@
 {
        struct tulip_cardbus_softc *csc = (void *) self;
        struct tulip_softc *sc = &csc->sc_tulip;
-       struct cardbus_devfunc *ct;
+       struct cardbus_devfunc *ct = csc->sc_ct;
        int rv;
        int reg;
 
-#if defined DIAGNOSTIC
-       if ((ct = csc->sc_ct) == NULL) {
+#if defined(DIAGNOSTIC)
+       if (ct == NULL) {
                panic("%s: data structure lacks\n", sc->sc_dev.dv_xname);
        }
 #endif
@@ -466,7 +466,8 @@
                        reg = TULIP_PCI_IOBA;
                }
 
-               Cardbus_mapreg_unmap(ct, reg, sc->sc_st, sc->sc_sh, csc->sc_mapsize);
+               Cardbus_mapreg_unmap(ct, reg, sc->sc_st, sc->sc_sh, 
+                   csc->sc_mapsize);
        }
        return (rv);
 }