diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2013-02-15 19:44:19 -0500 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2013-02-15 19:44:19 -0500 |
| commit | fd5e20bcb465e8d69a6fda617a7b35fb5f8d4eb1 (patch) | |
| tree | 8d54af1fb3aea5beb65582eb1a6626bc3563806a /drivers/pci | |
| parent | ad06bff31fbf0aba4e5faae936e12292a7972b05 (diff) | |
| parent | 969daa349f4821a02936af7202b51a9affc7b6da (diff) | |
Merge branch 'pci/misc' into next
* pci/misc:
PCI: Fix PCI Express Capability accessors for PCI_EXP_FLAGS
Diffstat (limited to 'drivers/pci')
| -rw-r--r-- | drivers/pci/access.c | 2 |
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) | |||
| 515 | return false; | 515 | return false; |
| 516 | 516 | ||
| 517 | switch (pos) { | 517 | switch (pos) { |
| 518 | case PCI_EXP_FLAGS_TYPE: | 518 | case PCI_EXP_FLAGS: |
| 519 | return true; | 519 | return true; |
| 520 | case PCI_EXP_DEVCAP: | 520 | case PCI_EXP_DEVCAP: |
| 521 | case PCI_EXP_DEVCTL: | 521 | case PCI_EXP_DEVCTL: |