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/esa.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/esa.c')
| -rw-r--r-- | sys/dev/pci/esa.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/sys/dev/pci/esa.c b/sys/dev/pci/esa.c index 6151dddc025..945b7624135 100644 --- a/sys/dev/pci/esa.c +++ b/sys/dev/pci/esa.c @@ -1,4 +1,4 @@ -/* $OpenBSD: esa.c,v 1.8 2003/10/07 14:11:04 fgsch Exp $ */ +/* $OpenBSD: esa.c,v 1.9 2005/08/09 04:10:11 mickey Exp $ */ /* $NetBSD: esa.c,v 1.12 2002/03/24 14:17:35 jmcneill Exp $ */ /* @@ -1015,7 +1015,6 @@ esa_attach(struct device *parent, struct device *self, void *aux) pci_intr_handle_t ih; struct esa_card_type *card; const char *intrstr; - u_int32_t data; int i, len; for (card = esa_card_types; card->pci_vendor_id; card++) @@ -1027,11 +1026,6 @@ esa_attach(struct device *parent, struct device *self, void *aux) break; } - data = pci_conf_read(pc, tag, PCI_COMMAND_STATUS_REG); - data |= (PCI_COMMAND_IO_ENABLE | PCI_COMMAND_MEM_ENABLE - | PCI_COMMAND_MASTER_ENABLE); - pci_conf_write(pc, tag, PCI_COMMAND_STATUS_REG, data); - /* Map I/O register */ if (pci_mapreg_map(pa, PCI_CBIO, PCI_MAPREG_TYPE_IO, 0, &sc->sc_iot, &sc->sc_ioh, &sc->sc_iob, &sc->sc_ios, 0)) { |