As with r323317, hold off on releasing the intrhook during boot until
we're ready to accept probing from GEOM. Untested, but the pattern is the same as with aac.
This commit is contained in:
parent
cc336c7805
commit
55550830cf
@ -302,11 +302,6 @@ amr_startup(void *arg)
|
|||||||
|
|
||||||
debug_called(1);
|
debug_called(1);
|
||||||
|
|
||||||
/* pull ourselves off the intrhook chain */
|
|
||||||
if (sc->amr_ich.ich_func)
|
|
||||||
config_intrhook_disestablish(&sc->amr_ich);
|
|
||||||
sc->amr_ich.ich_func = NULL;
|
|
||||||
|
|
||||||
/* get up-to-date drive information */
|
/* get up-to-date drive information */
|
||||||
if (amr_query_controller(sc)) {
|
if (amr_query_controller(sc)) {
|
||||||
device_printf(sc->amr_dev, "can't scan controller for drives\n");
|
device_printf(sc->amr_dev, "can't scan controller for drives\n");
|
||||||
@ -343,6 +338,11 @@ amr_startup(void *arg)
|
|||||||
/* interrupts will be enabled before we do anything more */
|
/* interrupts will be enabled before we do anything more */
|
||||||
sc->amr_state |= AMR_STATE_INTEN;
|
sc->amr_state |= AMR_STATE_INTEN;
|
||||||
|
|
||||||
|
/* pull ourselves off the intrhook chain */
|
||||||
|
if (sc->amr_ich.ich_func)
|
||||||
|
config_intrhook_disestablish(&sc->amr_ich);
|
||||||
|
sc->amr_ich.ich_func = NULL;
|
||||||
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user