28c28
< __FBSDID("$FreeBSD: head/sys/dev/aic/aic_cbus.c 170872 2007-06-17 05:55:54Z scottl $");
---
> __FBSDID("$FreeBSD: head/sys/dev/aic/aic_cbus.c 241591 2012-10-15 16:09:59Z jhb $");
30a31
> #include <sys/callout.h>
31a33
> #include <sys/lock.h>
32a35
> #include <sys/mutex.h>
95c98
< sc->sc_port = sc->sc_irq = sc->sc_drq = 0;
---
> sc->sc_port = sc->sc_irq = sc->sc_drq = NULL;
104a108
> mtx_init(&sc->sc_aic.lock, "aic", NULL, MTX_DEF);
129,131c133
< sc->sc_aic.unit = device_get_unit(dev);
< sc->sc_aic.tag = rman_get_bustag(sc->sc_port);
< sc->sc_aic.bsh = rman_get_bushandle(sc->sc_port);
---
> sc->sc_aic.res = sc->sc_port;
146c148,149
< sc->sc_port = sc->sc_irq = sc->sc_drq = 0;
---
> sc->sc_port = sc->sc_irq = sc->sc_drq = NULL;
> mtx_destroy(&sc->sc_aic.lock);
175,176c178
< if (!aic_probe(aic)) {
< aic_isa_release_resources(dev);
---
> if (aic_probe(aic) == 0)
178d179
< }
185a187
> aic_isa_release_resources(dev);
214,215c216,217
< error = bus_setup_intr(dev, sc->sc_irq, INTR_TYPE_CAM|INTR_ENTROPY,
< NULL, aic_intr, aic, &sc->sc_ih);
---
> error = bus_setup_intr(dev, sc->sc_irq, INTR_TYPE_CAM | INTR_ENTROPY |
> INTR_MPSAFE, NULL, aic_intr, aic, &sc->sc_ih);