summaryrefslogtreecommitdiff
path: root/sys/dev/pci/neo.c
diff options
context:
space:
mode:
authorMichael Shalayeff <mickey@cvs.openbsd.org>2005-08-09 04:10:14 +0000
committerMichael Shalayeff <mickey@cvs.openbsd.org>2005-08-09 04:10:14 +0000
commit8acbfa59711c28388979dd47c85ac8fda2aef774 (patch)
tree0a8f13a9f8aea3ce00fc1186bafa554451900d2b /sys/dev/pci/neo.c
parentea9360cd901a644039d864bec59eb393c782c450 (diff)
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/neo.c')
-rw-r--r--sys/dev/pci/neo.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/sys/dev/pci/neo.c b/sys/dev/pci/neo.c
index fab830e8b1b..a0b8f3e877b 100644
--- a/sys/dev/pci/neo.c
+++ b/sys/dev/pci/neo.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: neo.c,v 1.18 2004/12/12 06:50:20 deraadt Exp $ */
+/* $OpenBSD: neo.c,v 1.19 2005/08/09 04:10:13 mickey Exp $ */
/*
* Copyright (c) 1999 Cameron Grant <gandalf@vilnya.demon.co.uk>
@@ -566,7 +566,6 @@ neo_attach(parent, self, aux)
pci_chipset_tag_t pc = pa->pa_pc;
char const *intrstr;
pci_intr_handle_t ih;
- pcireg_t csr;
int error;
sc->type = pa->pa_id;
@@ -607,11 +606,6 @@ neo_attach(parent, self, aux)
if ((error = nm_init(sc)) != 0)
return;
- /* Enable the device. */
- csr = pci_conf_read(pa->pa_pc, pa->pa_tag, PCI_COMMAND_STATUS_REG);
- pci_conf_write(pa->pa_pc, pa->pa_tag, PCI_COMMAND_STATUS_REG,
- csr | PCI_COMMAND_MASTER_ENABLE);
-
sc->host_if.arg = sc;
sc->host_if.attach = neo_attach_codec;