From 20b62bf7ed7bd3df7db5938b675b7ea4174287e2 Mon Sep 17 00:00:00 2001
From: Bjorn Helgaas <bhelgaas@google.com>
Date: Wed, 5 Dec 2012 13:51:18 -0700
Subject: [PATCH] --- yaml --- r: 343283 b: refs/heads/master c:
 33e8b34fdd5640f3aa1597710352349cbc823374 h: refs/heads/master i:   343281:
 a0c0587e92330f64cc791bcac1c1c7f9e1df3d42   343279:
 db634450d504b1cc1790a9670c62ea146771f1a6 v: v3

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

diff --git a/[refs] b/[refs]
index 2e5eb3b54125..59cf0abaa832 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 231afea189c6363f2921042576da74e1fb0f2fc3
+refs/heads/master: 33e8b34fdd5640f3aa1597710352349cbc823374
diff --git a/trunk/drivers/pci/pcie/portdrv_core.c b/trunk/drivers/pci/pcie/portdrv_core.c
index d03a7a39b2d8..70d3555903ae 100644
--- a/trunk/drivers/pci/pcie/portdrv_core.c
+++ b/trunk/drivers/pci/pcie/portdrv_core.c
@@ -120,8 +120,7 @@ static int pcie_port_enable_msix(struct pci_dev *dev, int *vectors, int mask)
 		 * the value in this field indicates which MSI-X Table entry is
 		 * used to generate the interrupt message."
 		 */
-		pos = pci_pcie_cap(dev);
-		pci_read_config_word(dev, pos + PCI_EXP_FLAGS, &reg16);
+		pcie_capability_read_word(dev, PCI_EXP_FLAGS, &reg16);
 		entry = (reg16 & PCI_EXP_FLAGS_IRQ) >> 9;
 		if (entry >= nr_entries)
 			goto Error;