svn commit: r362357 - stable/12/sys/dev/nvme

[Alexander Motin]

Author: mav
Date: Fri Jun 19 00:45:29 2020
New Revision: 362357
URL: https://svnweb.freebsd.org/changeset/base/362357

Log:
  MFC r362100: Fix config_intrhook leak on initial reset failure.

Modified:
  stable/12/sys/dev/nvme/nvme_ctrlr.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/sys/dev/nvme/nvme_ctrlr.c
==============================================================================
--- stable/12/sys/dev/nvme/nvme_ctrlr.c	Fri Jun 19 00:44:35 2020	(r362356)
+++ stable/12/sys/dev/nvme/nvme_ctrlr.c	Fri Jun 19 00:45:29 2020	(r362357)
@@ -1090,12 +1090,14 @@ nvme_ctrlr_start_config_hook(void *arg)
 	status = nvme_ctrlr_hw_reset(ctrlr);
 	if (status != 0) {
 		nvme_ctrlr_fail(ctrlr);
+		config_intrhook_disestablish(&ctrlr->config_hook);
 		return;
 	}
 
 	status = nvme_ctrlr_hw_reset(ctrlr);
 	if (status != 0) {
 		nvme_ctrlr_fail(ctrlr);
+		config_intrhook_disestablish(&ctrlr->config_hook);
 		return;
 	}