summaryrefslogtreecommitdiff
path: root/sys/arch
diff options
context:
space:
mode:
authorPer Fogelstrom <pefo@cvs.openbsd.org>1997-05-01 15:18:14 +0000
committerPer Fogelstrom <pefo@cvs.openbsd.org>1997-05-01 15:18:14 +0000
commit474f791cd2c0a3e066368adf7693667ac4d320d4 (patch)
tree2809de8cd519e05c01de3cfdba30d728d5470af0 /sys/arch
parent266e37bbe3b824902acb4a40870f8cb934e2fe23 (diff)
bug bug bug..
Diffstat (limited to 'sys/arch')
-rw-r--r--sys/arch/arc/dev/com_lbus.c19
1 files changed, 5 insertions, 14 deletions
diff --git a/sys/arch/arc/dev/com_lbus.c b/sys/arch/arc/dev/com_lbus.c
index fc877aad0b8..b88cd8a00ee 100644
--- a/sys/arch/arc/dev/com_lbus.c
+++ b/sys/arch/arc/dev/com_lbus.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: com_lbus.c,v 1.3 1997/04/10 16:29:15 pefo Exp $ */
+/* $OpenBSD: com_lbus.c,v 1.4 1997/05/01 15:18:13 pefo Exp $ */
/*
* Copyright (c) 1993, 1994 Charles Hannum.
@@ -92,29 +92,20 @@ com_localbus_probe(parent, match, aux)
{
bus_space_tag_t iot;
bus_space_handle_t ioh;
- int iobase, needioh;
+ int iobase;
int rv = 1;
struct confargs *ca = aux;
if(!BUS_MATCHNAME(ca, "com"))
return(0);
- iobase = (long)BUS_CVTADDR(ca);
+ ioh = iobase = (long)BUS_CVTADDR(ca);
iot = &arc_bus_io;
- needioh = 1;
/* if it's in use as console, it's there. */
- if (iobase == comconsaddr && !comconsattached)
- goto out;
-
- if (needioh && bus_space_map(iot, iobase, COM_NPORTS, 0, &ioh)) {
- rv = 0;
- goto out;
+ if (iobase == comconsaddr && !comconsattached) {
+ return(rv);
}
rv = comprobe1(iot, ioh, iobase);
- if (needioh)
- bus_space_unmap(iot, ioh, COM_NPORTS);
-
-out:
return (rv);
}