diff options
author | se <se@FreeBSD.org> | 1995-03-22 21:35:39 +0000 |
---|---|---|
committer | se <se@FreeBSD.org> | 1995-03-22 21:35:39 +0000 |
commit | 3193e6f8ade0b3ce701667059d1124dfeccfa50a (patch) | |
tree | f73f460f8cac18d4dfa83a219f76f4d09896fb02 /sys/i386/pci | |
parent | 0df495007935aa93c101bfc9268cc5d213932df6 (diff) | |
download | FreeBSD-src-3193e6f8ade0b3ce701667059d1124dfeccfa50a.zip FreeBSD-src-3193e6f8ade0b3ce701667059d1124dfeccfa50a.tar.gz |
Correct pcibus_setup() to return as soon as one test succeeds.
Diffstat (limited to 'sys/i386/pci')
-rw-r--r-- | sys/i386/pci/pci_bus.c | 4 | ||||
-rw-r--r-- | sys/i386/pci/pci_cfgreg.c | 4 | ||||
-rw-r--r-- | sys/i386/pci/pci_pir.c | 4 |
3 files changed, 9 insertions, 3 deletions
diff --git a/sys/i386/pci/pci_bus.c b/sys/i386/pci/pci_bus.c index 0246a71..7fbb80f 100644 --- a/sys/i386/pci/pci_bus.c +++ b/sys/i386/pci/pci_bus.c @@ -1,6 +1,6 @@ /************************************************************************** ** -** $Id: pcibus.c,v 1.6 1995/03/22 10:52:05 se Exp $ +** $Id: pcibus.c,v 1.7 1995/03/22 19:51:59 se Exp $ ** ** pci bus subroutines for i386 architecture. ** @@ -162,6 +162,7 @@ pcibus_setup (void) if (!inb (CONF2_ENABLE_PORT) && !inb (CONF2_FORWARD_PORT)) { pci_mechanism = 2; pci_maxdevice = 16; + return; }; /*--------------------------------------- @@ -177,6 +178,7 @@ pcibus_setup (void) if (result == CONF1_ENABLE) { pci_mechanism = 1; pci_maxdevice = 32; + return; }; /*--------------------------------------- diff --git a/sys/i386/pci/pci_cfgreg.c b/sys/i386/pci/pci_cfgreg.c index 0246a71..7fbb80f 100644 --- a/sys/i386/pci/pci_cfgreg.c +++ b/sys/i386/pci/pci_cfgreg.c @@ -1,6 +1,6 @@ /************************************************************************** ** -** $Id: pcibus.c,v 1.6 1995/03/22 10:52:05 se Exp $ +** $Id: pcibus.c,v 1.7 1995/03/22 19:51:59 se Exp $ ** ** pci bus subroutines for i386 architecture. ** @@ -162,6 +162,7 @@ pcibus_setup (void) if (!inb (CONF2_ENABLE_PORT) && !inb (CONF2_FORWARD_PORT)) { pci_mechanism = 2; pci_maxdevice = 16; + return; }; /*--------------------------------------- @@ -177,6 +178,7 @@ pcibus_setup (void) if (result == CONF1_ENABLE) { pci_mechanism = 1; pci_maxdevice = 32; + return; }; /*--------------------------------------- diff --git a/sys/i386/pci/pci_pir.c b/sys/i386/pci/pci_pir.c index 0246a71..7fbb80f 100644 --- a/sys/i386/pci/pci_pir.c +++ b/sys/i386/pci/pci_pir.c @@ -1,6 +1,6 @@ /************************************************************************** ** -** $Id: pcibus.c,v 1.6 1995/03/22 10:52:05 se Exp $ +** $Id: pcibus.c,v 1.7 1995/03/22 19:51:59 se Exp $ ** ** pci bus subroutines for i386 architecture. ** @@ -162,6 +162,7 @@ pcibus_setup (void) if (!inb (CONF2_ENABLE_PORT) && !inb (CONF2_FORWARD_PORT)) { pci_mechanism = 2; pci_maxdevice = 16; + return; }; /*--------------------------------------- @@ -177,6 +178,7 @@ pcibus_setup (void) if (result == CONF1_ENABLE) { pci_mechanism = 1; pci_maxdevice = 32; + return; }; /*--------------------------------------- |