[src/netbsd-1-4]: src/sys/dev/isa pullup 1.3->1.4 (bad)

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

details:   https://anonhg.NetBSD.org/src/rev/48de2364fed3
branches:  netbsd-1-4
changeset: 468592:48de2364fed3
user:      perry <perry%NetBSD.org@localhost>
date:      Fri Apr 30 16:40:53 1999 +0000

description:
pullup 1.3->1.4 (bad)

diffstat:

 sys/dev/isa/if_tr_isa.c |  14 +++++++++-----
 1 files changed, 9 insertions(+), 5 deletions(-)

diffs (29 lines):

diff -r 317a5a8bd1b0 -r 48de2364fed3 sys/dev/isa/if_tr_isa.c
--- a/sys/dev/isa/if_tr_isa.c   Fri Apr 30 16:40:18 1999 +0000
+++ b/sys/dev/isa/if_tr_isa.c   Fri Apr 30 16:40:53 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_tr_isa.c,v 1.2.2.1 1999/04/29 22:22:55 perry Exp $  */
+/*     $NetBSD: if_tr_isa.c,v 1.2.2.2 1999/04/30 16:40:53 perry Exp $  */
 
 #undef TRISADEBUG
 /*
@@ -191,11 +191,15 @@
 
        sc->sc_piot = ia->ia_iot;
        sc->sc_memt = ia->ia_memt;
-       if (tr_isa_map_io(ia, &sc->sc_pioh, &sc->sc_mmioh))
-               panic("tr_isa_attach: IO space vanished\n");
+       if (tr_isa_map_io(ia, &sc->sc_pioh, &sc->sc_mmioh)) {
+               printf("tr_isa_attach: IO space vanished\n");
+               return;
+       }
        if (bus_space_map(sc->sc_memt, ia->ia_maddr, ia->ia_msize, 0,
-           &sc->sc_sramh))
-               panic("tr_isa_attach: shared ram space vanished\n");
+           &sc->sc_sramh)) {
+               printf("tr_isa_attach: shared ram space vanished\n");
+               return;
+       }
        /* set ACA offset */
        sc->sc_aca = TR_ACA_OFFSET;
        sc->sc_memwinsz = ia->ia_msize;