diff --git a/[refs] b/[refs]
index 2b3e8f32f83e..e9ca9e7ef4cf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2c21fd4b333e4c780a46edcd6d1e85bfc6cdf371
+refs/heads/master: 7ba1930db02fc3118165338ef4e562869f575583
diff --git a/trunk/drivers/pci/msi.c b/trunk/drivers/pci/msi.c
index a088fc6f5838..9ab4fe8f20af 100644
--- a/trunk/drivers/pci/msi.c
+++ b/trunk/drivers/pci/msi.c
@@ -383,6 +383,7 @@ static int msi_capability_init(struct pci_dev *dev, int nvec)
 	/* Configure MSI capability structure */
 	ret = arch_setup_msi_irqs(dev, nvec, PCI_CAP_ID_MSI);
 	if (ret) {
+		msi_mask_irq(entry, mask, ~mask);
 		msi_free_irqs(dev);
 		return ret;
 	}