From fac2945952427335feae62449cc8511abd140505 Mon Sep 17 00:00:00 2001
From: Matthew Wilcox <matthew@wil.cx>
Date: Fri, 8 May 2009 07:13:33 -0600
Subject: [PATCH] --- yaml --- r: 145046 b: refs/heads/master c:
 8d181018532dd709ec1f789e374cda92d7b01ce1 h: refs/heads/master v: v3

---
 [refs]                  | 2 +-
 trunk/drivers/pci/msi.c | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 095dec01c343..0067d8f326a8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 029091df01116aff8dea89ce96a0a2534401803a
+refs/heads/master: 8d181018532dd709ec1f789e374cda92d7b01ce1
diff --git a/trunk/drivers/pci/msi.c b/trunk/drivers/pci/msi.c
index 6f2e6295e773..362773247fbf 100644
--- a/trunk/drivers/pci/msi.c
+++ b/trunk/drivers/pci/msi.c
@@ -455,8 +455,6 @@ static int msix_capability_init(struct pci_dev *dev,
 		entry->msi_attrib.default_irq = dev->irq;
 		entry->msi_attrib.pos = pos;
 		entry->mask_base = base;
-		entry->masked = readl(base + j * PCI_MSIX_ENTRY_SIZE +
-					PCI_MSIX_ENTRY_VECTOR_CTRL_OFFSET);
 		msix_mask_irq(entry, 1);
 
 		list_add_tail(&entry->list, &dev->msi_list);
@@ -493,6 +491,12 @@ static int msix_capability_init(struct pci_dev *dev,
 	msix_set_enable(dev, 1);
 	dev->msix_enabled = 1;
 
+	list_for_each_entry(entry, &dev->msi_list, list) {
+		int vector = entry->msi_attrib.entry_nr;
+		entry->masked = readl(base + vector * PCI_MSIX_ENTRY_SIZE +
+					PCI_MSIX_ENTRY_VECTOR_CTRL_OFFSET);
+	}
+
 	return 0;
 }