svn commit: r323319 - head/sys/dev/amr

[Scott Long]

Author: scottl
Date: Fri Sep  8 17:40:29 2017
New Revision: 323319
URL: https://svnweb.freebsd.org/changeset/base/323319

Log:
  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.

Modified:
  head/sys/dev/amr/amr.c

Modified: head/sys/dev/amr/amr.c
==============================================================================
--- head/sys/dev/amr/amr.c	Fri Sep  8 16:59:56 2017	(r323318)
+++ head/sys/dev/amr/amr.c	Fri Sep  8 17:40:29 2017	(r323319)
@@ -302,11 +302,6 @@ amr_startup(void *arg)
     
     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 */
     if (amr_query_controller(sc)) {
 	device_printf(sc->amr_dev, "can't scan controller for drives\n");
@@ -342,6 +337,11 @@ amr_startup(void *arg)
 
     /* interrupts will be enabled before we do anything more */
     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;
 }