summaryrefslogtreecommitdiffstats
path: root/sys/dev/pci/safe.c
diff options
context:
space:
mode:
authormickey <mickey@openbsd.org>2005-08-09 04:10:10 +0000
committermickey <mickey@openbsd.org>2005-08-09 04:10:10 +0000
commit798bf0b9f6d5a3fb920772d2e82520bf10a1fedb (patch)
treeab8ef89a4d152df717d75a6e5bef80392473f2ee /sys/dev/pci/safe.c
parentBack out a change from tzcode2005c that can cause an infinite loop in mktime(). (diff)
downloadwireguard-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/safe.c')
-rw-r--r--sys/dev/pci/safe.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/sys/dev/pci/safe.c b/sys/dev/pci/safe.c
index ce6db125d4d..768af514f89 100644
--- a/sys/dev/pci/safe.c
+++ b/sys/dev/pci/safe.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: safe.c,v 1.14 2004/05/07 14:42:26 millert Exp $ */
+/* $OpenBSD: safe.c,v 1.15 2005/08/09 04:10:13 mickey Exp $ */
/*-
* Copyright (c) 2003 Sam Leffler, Errno Consulting
@@ -168,9 +168,6 @@ safe_attach(struct device *parent, struct device *self, void *aux)
sc->sc_dmat = pa->pa_dmat;
cmd = pci_conf_read(pa->pa_pc, pa->pa_tag, PCI_COMMAND_STATUS_REG);
- cmd |= PCI_COMMAND_MEM_ENABLE | PCI_COMMAND_MASTER_ENABLE;
- pci_conf_write(pa->pa_pc, pa->pa_tag, PCI_COMMAND_STATUS_REG, cmd);
- cmd = pci_conf_read(pa->pa_pc, pa->pa_tag, PCI_COMMAND_STATUS_REG);
if (!(cmd & PCI_COMMAND_MEM_ENABLE)) {
printf(": failed to enable memory mapping\n");