diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2002-02-18 23:23:47 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2002-02-18 23:23:47 +0000 |
| commit | 7d38429889d8e8be44db02000c099f7df01f955e (patch) | |
| tree | 53777f66651cc96ef5f1ea03eebfd22bf06609b0 /sys | |
| parent | 5b06d081bab2c17b23824911131c523c59cfba2a (diff) | |
Correct fix for breakage in rev 1.23. Sorry for the mess.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/pci/pci.c | 13 |
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; } |