diff options
| author | Scott Long <scottl@FreeBSD.org> | 2017-09-10 07:10:40 +0000 |
|---|---|---|
| committer | Scott Long <scottl@FreeBSD.org> | 2017-09-10 07:10:40 +0000 |
| commit | a4bb51a4a28746c5f59dbf8c193b133c7bfa69af (patch) | |
| tree | 295e314a16df5403e0527f988ccb5016d8b75b50 /sys/dev/mps | |
| parent | 1415db6ca214c2d14ab73a552d8d3509691f8231 (diff) | |
| download | src-a4bb51a4a28746c5f59dbf8c193b133c7bfa69af.tar.gz src-a4bb51a4a28746c5f59dbf8c193b133c7bfa69af.zip | |
Fix intrhook release in MPR and MPS for EARLY_AP_STARTUP.
Reported by: Limelight
Sponsored by: Netflix
Notes
Notes:
svn path=/head/; revision=323384
Diffstat (limited to 'sys/dev/mps')
| -rw-r--r-- | sys/dev/mps/mps.c | 5 | ||||
| -rw-r--r-- | sys/dev/mps/mps_sas.c | 5 |
2 files changed, 5 insertions, 5 deletions
diff --git a/sys/dev/mps/mps.c b/sys/dev/mps/mps.c index 233eb0ddc232..7715a8bf0a4d 100644 --- a/sys/dev/mps/mps.c +++ b/sys/dev/mps/mps.c @@ -1673,6 +1673,11 @@ mps_startup(void *arg) mps_mapping_initialize(sc); mpssas_startup(sc); mps_unlock(sc); + + mps_dprint(sc, MPS_INIT, "disestablish config intrhook\n"); + config_intrhook_disestablish(&sc->mps_ich); + sc->mps_ich.ich_arg = NULL; + mps_dprint(sc, MPS_INIT, "%s exit\n", __func__); } diff --git a/sys/dev/mps/mps_sas.c b/sys/dev/mps/mps_sas.c index a1fe74348f45..6446b0ffba07 100644 --- a/sys/dev/mps/mps_sas.c +++ b/sys/dev/mps/mps_sas.c @@ -3557,11 +3557,6 @@ mpssas_portenable_complete(struct mps_softc *sc, struct mps_command *cm) mps_dprint(sc, MPS_FAULT, "Portenable failed\n"); mps_free_command(sc, cm); - if (sc->mps_ich.ich_arg != NULL) { - mps_dprint(sc, MPS_XINFO, "disestablish config intrhook\n"); - config_intrhook_disestablish(&sc->mps_ich); - sc->mps_ich.ich_arg = NULL; - } /* * Get WarpDrive info after discovery is complete but before the scan |