diff options
Diffstat (limited to 'sys/dev/buslogic/bt_pci.c')
| -rw-r--r-- | sys/dev/buslogic/bt_pci.c | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/sys/dev/buslogic/bt_pci.c b/sys/dev/buslogic/bt_pci.c index 6e03a97..c3a3681 100644 --- a/sys/dev/buslogic/bt_pci.c +++ b/sys/dev/buslogic/bt_pci.c @@ -148,7 +148,7 @@ bt_pci_probe(device_t dev) } bt_pci_release_resources(dev); device_set_desc(dev, "Buslogic Multi-Master SCSI Host Adapter"); - return (0); + return (BUS_PROBE_DEFAULT); } default: break; @@ -161,7 +161,6 @@ static int bt_pci_attach(device_t dev) { struct bt_softc *bt = device_get_softc(dev); - int opri; int error; /* Initialize softc */ @@ -183,31 +182,19 @@ bt_pci_attach(device_t dev) /* nsegments */ ~0, /* maxsegsz */ BUS_SPACE_MAXSIZE_32BIT, /* flags */ 0, - /* lockfunc */ busdma_lock_mutex, - /* lockarg */ &Giant, + /* lockfunc */ NULL, + /* lockarg */ NULL, &bt->parent_dmat) != 0) { bt_pci_release_resources(dev); return (ENOMEM); } - /* - * Protect ourself from spurrious interrupts during - * intialization and attach. We should really rely - * on interrupts during attach, but we don't have - * access to our interrupts during ISA probes, so until - * that changes, we mask our interrupts during attach - * too. - */ - opri = splcam(); - if (bt_probe(dev) || bt_fetch_adapter_info(dev) || bt_init(dev)) { bt_pci_release_resources(dev); - splx(opri); return (ENXIO); } error = bt_attach(dev); - splx(opri); if (error) { bt_pci_release_resources(dev); |
