diff options
| author | Stefan Eßer <se@FreeBSD.org> | 1995-03-22 21:35:39 +0000 |
|---|---|---|
| committer | Stefan Eßer <se@FreeBSD.org> | 1995-03-22 21:35:39 +0000 |
| commit | 0f29bf015cacb988d59f71f88891fc22b785b06d (patch) | |
| tree | f73f460f8cac18d4dfa83a219f76f4d09896fb02 /sys/amd64/pci | |
| parent | 2d333dc2dd17d3f986dcad59d8e9d00e24d1cac1 (diff) | |
| download | src-0f29bf015cacb988d59f71f88891fc22b785b06d.tar.gz src-0f29bf015cacb988d59f71f88891fc22b785b06d.zip | |
Correct pcibus_setup() to return as soon as one test succeeds.
Notes
Notes:
svn path=/head/; revision=7254
Diffstat (limited to 'sys/amd64/pci')
| -rw-r--r-- | sys/amd64/pci/pci_bus.c | 4 | ||||
| -rw-r--r-- | sys/amd64/pci/pci_cfgreg.c | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/sys/amd64/pci/pci_bus.c b/sys/amd64/pci/pci_bus.c index 0246a71f46ef..7fbb80f12cd1 100644 --- a/sys/amd64/pci/pci_bus.c +++ b/sys/amd64/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/amd64/pci/pci_cfgreg.c b/sys/amd64/pci/pci_cfgreg.c index 0246a71f46ef..7fbb80f12cd1 100644 --- a/sys/amd64/pci/pci_cfgreg.c +++ b/sys/amd64/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; }; /*--------------------------------------- |