aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pci/hotplug/cpcihp_generic.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/pci/hotplug/cpcihp_generic.c')
-rw-r--r--drivers/pci/hotplug/cpcihp_generic.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/pci/hotplug/cpcihp_generic.c b/drivers/pci/hotplug/cpcihp_generic.c
index f3852a6b74ea..148fb463b81c 100644
--- a/drivers/pci/hotplug/cpcihp_generic.c
+++ b/drivers/pci/hotplug/cpcihp_generic.c
@@ -154,12 +154,18 @@ static int __init cpcihp_generic_init(void)
154 if(!r) 154 if(!r)
155 return -EBUSY; 155 return -EBUSY;
156 156
157 dev = pci_find_slot(bridge_busnr, PCI_DEVFN(bridge_slot, 0)); 157 bus = pci_find_bus(0, bridge_busnr);
158 if (!bus) {
159 err("Invalid bus number %d", bridge_busnr);
160 return -EINVAL;
161 }
162 dev = pci_get_slot(bus, PCI_DEVFN(bridge_slot, 0));
158 if(!dev || dev->hdr_type != PCI_HEADER_TYPE_BRIDGE) { 163 if(!dev || dev->hdr_type != PCI_HEADER_TYPE_BRIDGE) {
159 err("Invalid bridge device %s", bridge); 164 err("Invalid bridge device %s", bridge);
160 return -EINVAL; 165 return -EINVAL;
161 } 166 }
162 bus = dev->subordinate; 167 bus = dev->subordinate;
168 pci_dev_put(dev);
163 169
164 memset(&generic_hpc, 0, sizeof (struct cpci_hp_controller)); 170 memset(&generic_hpc, 0, sizeof (struct cpci_hp_controller));
165 generic_hpc_ops.query_enum = query_enum; 171 generic_hpc_ops.query_enum = query_enum;