diff options
author | marius <marius@FreeBSD.org> | 2014-04-25 21:58:28 +0000 |
---|---|---|
committer | marius <marius@FreeBSD.org> | 2014-04-25 21:58:28 +0000 |
commit | d0bdbe8092973a4f0e56f06666cabc05ddb02691 (patch) | |
tree | 2d9631271fce647cfa205261892603d8ab6009db /sys/dev | |
parent | 6fda5991f64cbb3d64e1de1392d709d32b3bcc21 (diff) | |
download | FreeBSD-src-d0bdbe8092973a4f0e56f06666cabc05ddb02691.zip FreeBSD-src-d0bdbe8092973a4f0e56f06666cabc05ddb02691.tar.gz |
MFC: r260086
- Probe with BUS_PROBE_DEFAULT instead of 0.
- Remove clearing PCIM_CMD_INTxDIS; pci(4) will do that as appropriate since
r189367.
Diffstat (limited to 'sys/dev')
-rw-r--r-- | sys/dev/iwn/if_iwn.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/sys/dev/iwn/if_iwn.c b/sys/dev/iwn/if_iwn.c index 24fd6ba..609a703 100644 --- a/sys/dev/iwn/if_iwn.c +++ b/sys/dev/iwn/if_iwn.c @@ -441,7 +441,7 @@ iwn_probe(device_t dev) if (pci_get_vendor(dev) == ident->vendor && pci_get_device(dev) == ident->device) { device_set_desc(dev, ident->name); - return 0; + return (BUS_PROBE_DEFAULT); } } return ENXIO; @@ -453,7 +453,6 @@ iwn_attach(device_t dev) struct iwn_softc *sc = (struct iwn_softc *)device_get_softc(dev); struct ieee80211com *ic; struct ifnet *ifp; - uint32_t reg; int i, error, rid; uint8_t macaddr[IEEE80211_ADDR_LEN]; @@ -483,15 +482,6 @@ iwn_attach(device_t dev) /* Clear device-specific "PCI retry timeout" register (41h). */ pci_write_config(dev, 0x41, 0, 1); - /* Hardware bug workaround. */ - reg = pci_read_config(dev, PCIR_COMMAND, 2); - if (reg & PCIM_CMD_INTxDIS) { - DPRINTF(sc, IWN_DEBUG_RESET, "%s: PCIe INTx Disable set\n", - __func__); - reg &= ~PCIM_CMD_INTxDIS; - pci_write_config(dev, PCIR_COMMAND, reg, 2); - } - /* Enable bus-mastering. */ pci_enable_busmaster(dev); |