D29006.id84927.diff
No OneTemporary
Actions

Size

1006 B

Referenced Files

None

Subscribers

None

D29006.id84927.diff
View Options

	Index: sys/dev/nvme/nvme.c
	===================================================================
	--- sys/dev/nvme/nvme.c
	+++ sys/dev/nvme/nvme.c
	@@ -143,10 +143,7 @@
	{
	struct nvme_controller *ctrlr = DEVICE2SOFTC(dev);

	- if (ctrlr->config_hook.ich_arg != NULL) {
	- config_intrhook_disestablish(&ctrlr->config_hook);
	- ctrlr->config_hook.ich_arg = NULL;
	- }
	+ config_intrhook_drain(&ctrlr->config_hook);

	nvme_ctrlr_destruct(ctrlr, dev);
	return (0);
	Index: sys/dev/nvme/nvme_ctrlr.c
	===================================================================
	--- sys/dev/nvme/nvme_ctrlr.c
	+++ sys/dev/nvme/nvme_ctrlr.c
	@@ -1135,7 +1135,6 @@
	fail:
	nvme_ctrlr_fail(ctrlr);
	config_intrhook_disestablish(&ctrlr->config_hook);
	- ctrlr->config_hook.ich_arg = NULL;
	return;
	}

	@@ -1154,7 +1153,6 @@

	nvme_sysctl_initialize_ctrlr(ctrlr);
	config_intrhook_disestablish(&ctrlr->config_hook);
	- ctrlr->config_hook.ich_arg = NULL;

	ctrlr->is_initialized = 1;
	nvme_notify_new_controller(ctrlr);