|
@@ -1711,12 +1711,16 @@ struct pci_bus *pci_create_root_bus(struct device *parent, int bus,
|
|
bridge->dev.release = pci_release_bus_bridge_dev;
|
|
bridge->dev.release = pci_release_bus_bridge_dev;
|
|
dev_set_name(&bridge->dev, "pci%04x:%02x", pci_domain_nr(b), bus);
|
|
dev_set_name(&bridge->dev, "pci%04x:%02x", pci_domain_nr(b), bus);
|
|
error = pcibios_root_bridge_prepare(bridge);
|
|
error = pcibios_root_bridge_prepare(bridge);
|
|
- if (error)
|
|
|
|
- goto bridge_dev_reg_err;
|
|
|
|
|
|
+ if (error) {
|
|
|
|
+ kfree(bridge);
|
|
|
|
+ goto err_out;
|
|
|
|
+ }
|
|
|
|
|
|
error = device_register(&bridge->dev);
|
|
error = device_register(&bridge->dev);
|
|
- if (error)
|
|
|
|
- goto bridge_dev_reg_err;
|
|
|
|
|
|
+ if (error) {
|
|
|
|
+ put_device(&bridge->dev);
|
|
|
|
+ goto err_out;
|
|
|
|
+ }
|
|
b->bridge = get_device(&bridge->dev);
|
|
b->bridge = get_device(&bridge->dev);
|
|
device_enable_async_suspend(b->bridge);
|
|
device_enable_async_suspend(b->bridge);
|
|
pci_set_bus_of_node(b);
|
|
pci_set_bus_of_node(b);
|
|
@@ -1772,8 +1776,6 @@ struct pci_bus *pci_create_root_bus(struct device *parent, int bus,
|
|
class_dev_reg_err:
|
|
class_dev_reg_err:
|
|
put_device(&bridge->dev);
|
|
put_device(&bridge->dev);
|
|
device_unregister(&bridge->dev);
|
|
device_unregister(&bridge->dev);
|
|
-bridge_dev_reg_err:
|
|
|
|
- kfree(bridge);
|
|
|
|
err_out:
|
|
err_out:
|
|
kfree(b);
|
|
kfree(b);
|
|
return NULL;
|
|
return NULL;
|