diff options
| author |   mickey <mickey@openbsd.org> | 2005-08-09 04:10:10 +0000 |
|---|---|---|
| committer | mickey <mickey@openbsd.org> | 2005-08-09 04:10:10 +0000 |
| commit | 798bf0b9f6d5a3fb920772d2e82520bf10a1fedb (patch) | |
| tree | ab8ef89a4d152df717d75a6e5bef80392473f2ee /sys/dev/pci/if_em.c | |
| parent | Back out a change from tzcode2005c that can cause an infinite loop in mktime(). (diff) | |
| download | wireguard-openbsd-798bf0b9f6d5a3fb920772d2e82520bf10a1fedb.tar.xz wireguard-openbsd-798bf0b9f6d5a3fb920772d2e82520bf10a1fedb.zip | |
do not set PCI_COMMAND_MASTER_ENABLE explicitly as it's already set in pcisubmatch(); kettenis@ testing; brad@ ok
Diffstat (limited to 'sys/dev/pci/if_em.c')
| -rw-r--r-- | sys/dev/pci/if_em.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/sys/dev/pci/if_em.c b/sys/dev/pci/if_em.c index f8dcde9880a..6d8cb3c399f 100644 --- a/sys/dev/pci/if_em.c +++ b/sys/dev/pci/if_em.c @@ -31,7 +31,7 @@ POSSIBILITY OF SUCH DAMAGE. ***************************************************************************/ -/* $OpenBSD: if_em.c,v 1.66 2005/07/16 19:05:36 brad Exp $ */ +/* $OpenBSD: if_em.c,v 1.67 2005/08/09 04:10:12 mickey Exp $ */ /* $FreeBSD: if_em.c,v 1.46 2004/09/29 18:28:28 mlaier Exp $ */ #include <dev/pci/if_em.h> @@ -1394,15 +1394,6 @@ em_identify_hardware(struct em_softc *sc) /* Make sure our PCI config space has the necessary stuff set */ sc->hw.pci_cmd_word = pci_conf_read(pa->pa_pc, pa->pa_tag, PCI_COMMAND_STATUS_REG); - if (!((sc->hw.pci_cmd_word & PCI_COMMAND_MASTER_ENABLE) && - (sc->hw.pci_cmd_word & PCI_COMMAND_MEM_ENABLE))) { - printf("%s: Memory Access and/or Bus Master bits were not set!\n", - sc->sc_dv.dv_xname); - sc->hw.pci_cmd_word |= - (PCI_COMMAND_MASTER_ENABLE | PCI_COMMAND_MEM_ENABLE); - pci_conf_write(pa->pa_pc, pa->pa_tag, PCI_COMMAND_STATUS_REG, - sc->hw.pci_cmd_word); - } /* Save off the information about this board */ sc->hw.vendor_id = PCI_VENDOR(pa->pa_id); |