Index: dev/pci/pci.c
===================================================================
--- dev/pci/pci.c	(revision 194299)
+++ dev/pci/pci.c	(working copy)
@@ -2963,6 +2963,8 @@ pci_teardown_intr(device_t dev, device_t child, st
 			    ("MSI-X index too high"));
 			if (dinfo->cfg.msi.msi_handlers == 0)
 				return (EINVAL);
+			dinfo->cfg.msi.msi_addr = 0;
+			dinfo->cfg.msi.msi_data = 0;
 			dinfo->cfg.msi.msi_handlers--;
 			if (dinfo->cfg.msi.msi_handlers == 0)
 				pci_disable_msi(child);