diff options
| author | Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com> | 2008-05-27 19:07:33 +0900 |
|---|---|---|
| committer | Jesse Barnes <jbarnes@virtuousgeek.org> | 2008-05-27 15:43:47 -0700 |
| commit | 9e4f2e8d4ddb04ad16a3828cd9a369a5a5287009 (patch) | |
| tree | af2653041dbfb77139f24bc8ffd1c2553fd4ba1e | |
| parent | a86161b3134465f072d965ca7508ec9c1e2e52c7 (diff) | |
| download | kernel-crypto-9e4f2e8d4ddb04ad16a3828cd9a369a5a5287009.tar.gz kernel-crypto-9e4f2e8d4ddb04ad16a3828cd9a369a5a5287009.tar.xz kernel-crypto-9e4f2e8d4ddb04ad16a3828cd9a369a5a5287009.zip | |
pciehp: add message about pciehp_slot_with_bus option
Some (broken?) platform assign the same slot name to multiple hotplug
slots. On such system, slot initialization would fail because of name
collision. The pciehp driver already have a "slot_with_bus" module
option which adds the bus number into the slot name. This patch adds
the message about this module option that will be displayed when slot
name collision is detected.
Signed-off-by: Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
Signed-off-by: Kristen Carlson Accardi <kristen.c.accardi@intel.com>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
| -rw-r--r-- | drivers/pci/hotplug/pciehp_core.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/pci/hotplug/pciehp_core.c b/drivers/pci/hotplug/pciehp_core.c index 43d8ddb2d67..48a2ed37891 100644 --- a/drivers/pci/hotplug/pciehp_core.c +++ b/drivers/pci/hotplug/pciehp_core.c @@ -254,7 +254,11 @@ static int init_slots(struct controller *ctrl) slot->hp_slot, slot->number, ctrl->slot_device_offset); retval = pci_hp_register(hotplug_slot); if (retval) { - err ("pci_hp_register failed with error %d\n", retval); + err("pci_hp_register failed with error %d\n", retval); + if (retval == -EEXIST) + err("Failed to register slot because of name " + "collision. Try \'pciehp_slot_with_bus\' " + "module option.\n"); goto error_info; } /* create additional sysfs entries */ |