36c36
< __FBSDID("$FreeBSD: head/sys/dev/firewire/fwohci_pci.c 271795 2014-09-18 17:28:21Z will $");
---
> __FBSDID("$FreeBSD: head/sys/dev/firewire/fwohci_pci.c 272214 2014-09-27 16:50:21Z kan $");
70c70
< fwohci_pci_probe( device_t dev )
---
> fwohci_pci_probe(device_t dev)
214c214
< cmd &= ~PCIM_CMD_MWRICEN;
---
> cmd &= ~PCIM_CMD_MWRICEN;
314,316c314,317
< printf("fwohci_pci_attach: Could not allocate DMA tag "
< "- error %d\n", err);
< return (ENOMEM);
---
> device_printf(self, "fwohci_pci_attach: Could not allocate DMA "
> "tag - error %d\n", err);
> fwohci_pci_detach(self);
> return (ENOMEM);
321c322
< if (err) {
---
> if (err != 0) {
340d340
<
346a347
>
371c372
< bus_release_resource(self, SYS_RES_MEMORY,PCI_CBMEM,sc->bsr);
---
> bus_release_resource(self, SYS_RES_MEMORY, PCI_CBMEM, sc->bsr);
431c432
< device_set_ivars(child, (void *)&sc->fc);
---
> device_set_ivars(child, &sc->fc);
450c451
< fwohci_poll((void *)sc, 0, -1);
---
> fwohci_poll(&sc->fc, 0, -1);