diff options
| -rw-r--r-- | drivers/pci/hotplug/cpcihp_generic.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/pci/hotplug/cpcihp_generic.c b/drivers/pci/hotplug/cpcihp_generic.c index 81af764c629b..a6a71c41cdf8 100644 --- a/drivers/pci/hotplug/cpcihp_generic.c +++ b/drivers/pci/hotplug/cpcihp_generic.c | |||
| @@ -154,12 +154,8 @@ static int __init cpcihp_generic_init(void) | |||
| 154 | if(!r) | 154 | if(!r) |
| 155 | return -EBUSY; | 155 | return -EBUSY; |
| 156 | 156 | ||
| 157 | bus = pci_find_bus(0, bridge_busnr); | 157 | dev = pci_get_domain_bus_and_slot(0, bridge_busnr, |
| 158 | if (!bus) { | 158 | PCI_DEVFN(bridge_slot, 0)); |
| 159 | err("Invalid bus number %d", bridge_busnr); | ||
| 160 | return -EINVAL; | ||
| 161 | } | ||
| 162 | dev = pci_get_slot(bus, PCI_DEVFN(bridge_slot, 0)); | ||
| 163 | if(!dev || dev->hdr_type != PCI_HEADER_TYPE_BRIDGE) { | 159 | if(!dev || dev->hdr_type != PCI_HEADER_TYPE_BRIDGE) { |
| 164 | err("Invalid bridge device %s", bridge); | 160 | err("Invalid bridge device %s", bridge); |
| 165 | pci_dev_put(dev); | 161 | pci_dev_put(dev); |
