From 9b62f7c11a931020aebfdb80b7d4545f017b1113 Mon Sep 17 00:00:00 2001
From: Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
Date: Tue, 27 May 2008 19:07:01 +0900
Subject: [PATCH] --- yaml --- r: 97407 b: refs/heads/master c:
 a86161b3134465f072d965ca7508ec9c1e2e52c7 h: refs/heads/master i:   97405:
 e732bb6c70d9f2d478135dc26f92d0810da962fd   97403:
 a3fb4a1212d43d589a616824d47c416d66233dd5   97399:
 0ae94b825958eab316258c4fcec9125ae0834809   97391:
 8ce6072c1124a90801a79af9a0c31093e0bf91d4   97375:
 028b29e7ced5952636f1b63c457c65eb479975b1   97343:
 a04a2277d6fbfb49974eeb044a8cdda8ec5ccbe1   97279:
 0775dc6c320ece2b445d82d3e8b4f68ed29f8e5f v: v3

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

diff --git a/[refs] b/[refs]
index 016f935fd287..79e2e43466c2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0711c70ec0e9d2c002b1e9b5fb9f21e49d77f4fd
+refs/heads/master: a86161b3134465f072d965ca7508ec9c1e2e52c7
diff --git a/trunk/drivers/pci/hotplug/pci_hotplug_core.c b/trunk/drivers/pci/hotplug/pci_hotplug_core.c
index 925ba16355ce..a11021e8ce37 100644
--- a/trunk/drivers/pci/hotplug/pci_hotplug_core.c
+++ b/trunk/drivers/pci/hotplug/pci_hotplug_core.c
@@ -619,6 +619,7 @@ static struct hotplug_slot *get_slot_from_name (const char *name)
 int pci_hp_register (struct hotplug_slot *slot)
 {
 	int result;
+	struct hotplug_slot *tmp;
 
 	if (slot == NULL)
 		return -ENODEV;
@@ -630,7 +631,11 @@ int pci_hp_register (struct hotplug_slot *slot)
 		return -EINVAL;
 	}
 
-	/* this can fail if we have already registered a slot with the same name */
+	/* Check if we have already registered a slot with the same name. */
+	tmp = get_slot_from_name(slot->name);
+	if (tmp)
+		return -EEXIST;
+
 	slot->kobj.kset = pci_hotplug_slots_kset;
 	result = kobject_init_and_add(&slot->kobj, &hotplug_slot_ktype, NULL,
 				      "%s", slot->name);