From 68e8e883e4772e781de2bca09cc7b7a06aaf472b Mon Sep 17 00:00:00 2001
From: Bjorn Helgaas <bhelgaas@google.com>
Date: Tue, 9 Apr 2013 16:46:12 -0600
Subject: [PATCH] --- yaml --- r: 362867 b: refs/heads/master c:
 545d7b78e0bbe686056cdd6cd431ca1946641b31 h: refs/heads/master i:   362865:
 044a1343a44e42d3327837fe07f64c7cf1f1e30c   362863:
 e612bbc599b737f3021e642e72eaad0c23bbe7c0 v: v3

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

diff --git a/[refs] b/[refs]
index 57037dc9e2b3..33cf6d9e731e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 05795726e82372d3fe46210fcb3320f1fa49aea7
+refs/heads/master: 545d7b78e0bbe686056cdd6cd431ca1946641b31
diff --git a/trunk/drivers/pci/hotplug/pciehp_acpi.c b/trunk/drivers/pci/hotplug/pciehp_acpi.c
index 24d709b7388c..ead7c534095e 100644
--- a/trunk/drivers/pci/hotplug/pciehp_acpi.c
+++ b/trunk/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++;