diff --git a/hw/ide/ich.c b/hw/ide/ich.c
index a3d475c..35e1de7 100644
--- a/hw/ide/ich.c
+++ b/hw/ide/ich.c
@@ -110,7 +110,7 @@ static int pci_ich9_uninit(PCIDevice *dev)
     struct AHCIPCIState *d;
     d = DO_UPCAST(struct AHCIPCIState, card, dev);
 
-    if (msi_enabled(dev)) {
+    if (msi_present(dev)) {
         msi_uninit(dev);
     }
 
diff --git a/hw/intel-hda.c b/hw/intel-hda.c
index b0b1d12..ff99348 100644
--- a/hw/intel-hda.c
+++ b/hw/intel-hda.c
@@ -1174,7 +1174,7 @@ static int intel_hda_exit(PCIDevice *pci)
 {
     IntelHDAState *d = DO_UPCAST(IntelHDAState, pci, pci);
 
-    if (d->msi) {
+    if (msi_present(pci)) {
         msi_uninit(&d->pci);
     }
     cpu_unregister_io_memory(d->mmio_addr);