Deleted Added
full compact
54c54
< __FBSDID("$FreeBSD: head/sys/dev/mfi/mfi_pci.c 233711 2012-03-30 23:05:48Z ambrisko $");
---
> __FBSDID("$FreeBSD: head/sys/dev/mfi/mfi_pci.c 254263 2013-08-12 23:30:01Z scottl $");
190d189
< uint32_t command;
199,211c198,199
< /* Verify that the adapter can be set up in PCI space */
< command = pci_read_config(dev, PCIR_COMMAND, 2);
< command |= PCIM_CMD_BUSMASTEREN;
< pci_write_config(dev, PCIR_COMMAND, command, 2);
< command = pci_read_config(dev, PCIR_COMMAND, 2);
< if ((command & PCIM_CMD_BUSMASTEREN) == 0) {
< device_printf(dev, "Can't enable PCI busmaster\n");
< return (ENXIO);
< }
< if ((command & PCIM_CMD_MEMEN) == 0) {
< device_printf(dev, "PCI memory window not available\n");
< return (ENXIO);
< }
---
> /* Ensure busmastering is enabled */
> pci_enable_busmaster(dev);