diff options
| author | Michael Shalayeff <mickey@cvs.openbsd.org> | 2005-08-09 04:10:14 +0000 |
|---|---|---|
| committer | Michael Shalayeff <mickey@cvs.openbsd.org> | 2005-08-09 04:10:14 +0000 |
| commit | 8acbfa59711c28388979dd47c85ac8fda2aef774 (patch) | |
| tree | 0a8f13a9f8aea3ce00fc1186bafa554451900d2b /sys/dev/pci/aac_pci.c | |
| parent | ea9360cd901a644039d864bec59eb393c782c450 (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/aac_pci.c')
| -rw-r--r-- | sys/dev/pci/aac_pci.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/sys/dev/pci/aac_pci.c b/sys/dev/pci/aac_pci.c index abdbf8dd51e..161b78354d2 100644 --- a/sys/dev/pci/aac_pci.c +++ b/sys/dev/pci/aac_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: aac_pci.c,v 1.14 2004/11/23 04:02:25 marco Exp $ */ +/* $OpenBSD: aac_pci.c,v 1.15 2005/08/09 04:10:10 mickey Exp $ */ /*- * Copyright (c) 2000 Michael Smith @@ -208,7 +208,7 @@ aac_pci_attach(parent, self, aux) struct pci_attach_args *pa = aux; pci_chipset_tag_t pc = pa->pa_pc; struct aac_softc *sc = (void *)self; - u_int16_t command; + pcireg_t command; bus_addr_t membase; bus_size_t memsize; pci_intr_handle_t ih; @@ -236,9 +236,6 @@ aac_pci_attach(parent, self, aux) * Verify that the adapter is correctly set up in PCI space. */ command = pci_conf_read(pc, pa->pa_tag, PCI_COMMAND_STATUS_REG); - command |= PCI_COMMAND_MASTER_ENABLE; - pci_conf_write(pc, pa->pa_tag, PCI_COMMAND_STATUS_REG, command); - command = pci_conf_read(pc, pa->pa_tag, PCI_COMMAND_STATUS_REG); AAC_DPRINTF(AAC_D_MISC, ("pci command status reg 0x08x ")); if (!(command & PCI_COMMAND_MASTER_ENABLE)) { printf("can't enable bus-master feature\n"); |