diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2013-04-15 14:37:28 -0600 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2013-04-15 14:37:28 -0600 |
| commit | 30e22b2337be44f4363fa52858d1ca7be6794ee8 (patch) | |
| tree | 1a696e2750fa6967c8849f54fd9360c18b55a139 /drivers/pci/hotplug | |
| parent | 26c0995e6db6a0de55395aeac520ea74c81b82c3 (diff) | |
| parent | 65195c76a7f855c879a168937f90a27032662328 (diff) | |
| download | op-kernel-dev-30e22b2337be44f4363fa52858d1ca7be6794ee8.zip op-kernel-dev-30e22b2337be44f4363fa52858d1ca7be6794ee8.tar.gz | |
Merge branch 'pci/misc' into next
* pci/misc:
PCI: Clean up quirk_io_region
PCI: Use vma_pages() to replace (vm_end - vm_start) >> PAGE_SHIFT
PCI: Use PCI_EXP_SLTCAP_PSN mask when extracting slot number
PCI: Remove unnecessary dependencies between PME and ACPI
[SCSI] mvumi: Use PCI_VENDOR_ID_MARVELL_EXT for 0x1b4b
[SCSI] mvsas: Use PCI_VENDOR_ID_MARVELL_EXT for 0x1b4b
ahci: Use PCI_VENDOR_ID_MARVELL_EXT for 0x1b4b
PCI: Define macro for Marvell vendor ID
PCI: Add MSI INTX_DISABLE quirks for AR8161/AR8162/AR8171/AR8172/E210X
PCI: aer_inject: Fix return values when device not found
Diffstat (limited to 'drivers/pci/hotplug')
| -rw-r--r-- | drivers/pci/hotplug/pciehp_acpi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/hotplug/pciehp_acpi.c b/drivers/pci/hotplug/pciehp_acpi.c index 24d709b..ead7c53 100644 --- a/drivers/pci/hotplug/pciehp_acpi.c +++ b/drivers/pci/hotplug/pciehp_acpi.c @@ -90,7 +90,7 @@ static int __init dummy_probe(struct pcie_device *dev) slot = kzalloc(sizeof(*slot), GFP_KERNEL); if (!slot) return -ENOMEM; - slot->number = slot_cap >> 19; + slot->number = (slot_cap & PCI_EXP_SLTCAP_PSN) >> 19; list_for_each_entry(tmp, &dummy_slots, list) { if (tmp->number == slot->number) dup_slot_id++; |
