summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormatthieu <matthieu@openbsd.org>2002-02-18 23:23:46 +0000
committermatthieu <matthieu@openbsd.org>2002-02-18 23:23:46 +0000
commit9d8cac032383ff32b0c01f93ed6ea6e1c79fc9a8 (patch)
tree8e22428a4e30a00aef1234069f7d3f51f4356702
parentfix issue on LP64 BE arch's w/ fcntl's F_GETOWN (diff)
downloadwireguard-openbsd-9d8cac032383ff32b0c01f93ed6ea6e1c79fc9a8.tar.xz
wireguard-openbsd-9d8cac032383ff32b0c01f93ed6ea6e1c79fc9a8.zip
Correct fix for breakage in rev 1.23. Sorry for the mess.
-rw-r--r--sys/dev/pci/pci.c13
1 files changed, 4 insertions, 9 deletions
diff --git a/sys/dev/pci/pci.c b/sys/dev/pci/pci.c
index be00456e4a3..a97d72886b6 100644
--- a/sys/dev/pci/pci.c
+++ b/sys/dev/pci/pci.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pci.c,v 1.24 2002/02/18 23:09:30 deraadt Exp $ */
+/* $OpenBSD: pci.c,v 1.25 2002/02/18 23:23:46 matthieu Exp $ */
/* $NetBSD: pci.c,v 1.31 1997/06/06 23:48:04 thorpej Exp $ */
/*
@@ -427,14 +427,9 @@ pciioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
goto done;
}
/* Check bounds */
-#ifdef PCI_USERCONF
- if (pci.sc_bus >= 256 ||
- io->pi_sel.pc_dev >= pci_bus_maxdevs(pc, pci.sc_bus) ||
- error = EINVAL;
- goto done;
- }
-#endif
- if (io->pi_sel.pc_func >= 8) {
+ if (pci->sc_bus >= 256 ||
+ io->pi_sel.pc_dev >= pci_bus_maxdevs(pc, pci->sc_bus) ||
+ io->pi_sel.pc_func >= 8) {
error = EINVAL;
goto done;
}