aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2013-02-15 17:44:19 -0700
committerBjorn Helgaas <bhelgaas@google.com>2013-02-15 17:44:19 -0700
commitfd5e20bcb465e8d69a6fda617a7b35fb5f8d4eb1 (patch)
tree8d54af1fb3aea5beb65582eb1a6626bc3563806a
parentMerge branch 'pci/jiang-pci_slot-kconfig' into next (diff)
parentPCI: Fix PCI Express Capability accessors for PCI_EXP_FLAGS (diff)
downloadlinux-dev-fd5e20bcb465e8d69a6fda617a7b35fb5f8d4eb1.tar.xz
linux-dev-fd5e20bcb465e8d69a6fda617a7b35fb5f8d4eb1.zip
Merge branch 'pci/misc' into next
* pci/misc: PCI: Fix PCI Express Capability accessors for PCI_EXP_FLAGS
-rw-r--r--drivers/pci/access.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/access.c b/drivers/pci/access.c
index 5278ac692cbf..1cc23661f79b 100644
--- a/drivers/pci/access.c
+++ b/drivers/pci/access.c
@@ -515,7 +515,7 @@ static bool pcie_capability_reg_implemented(struct pci_dev *dev, int pos)
return false;
switch (pos) {
- case PCI_EXP_FLAGS_TYPE:
+ case PCI_EXP_FLAGS:
return true;
case PCI_EXP_DEVCAP:
case PCI_EXP_DEVCTL: