From 89e698fa112a2767aad1139cf48a01a7967cbd1c Mon Sep 17 00:00:00 2001
From: Hidetoshi Seto <seto.hidetoshi@jp.fujitsu.com>
Date: Tue, 23 Jun 2009 17:39:27 +0900
Subject: [PATCH] --- yaml --- r: 154975 b: refs/heads/master c:
 7ba1930db02fc3118165338ef4e562869f575583 h: refs/heads/master i:   154973:
 3f4d0544df7a84976f2a36bbe6bc5cc6abc253f4   154971:
 974159d8684a9ef93c98cb120ffd03dec704c9db   154967:
 44cd414fc653e51d168f45ffaa446e0f263279ac   154959:
 d667d389bea447e9576d9618ed51b94b300ad240   154943:
 2a5cd22cb4a1b6af48be7301d0fccc129ce2a822 v: v3

---
 [refs]                  | 2 +-
 trunk/drivers/pci/msi.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

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;
 	}