On Wed, May 13, 2020 at 05:38:58PM -0500, Rob Herring wrote:
> If device_register() has an error, we should bail out of
> pci_register_host_bridge() rather than continuing on.
>
> Fixes: 37d6a0a6f470 ("PCI: Add pci_register_host_bridge() interface")
> Cc: Arnd Bergmann <arnd@xxxxxxxx>
> Cc: Bjorn Helgaas <bhelgaas@xxxxxxxxxx>
> Signed-off-by: Rob Herring <robh@xxxxxxxxxx>
Both applied to pci/enumeration for v5.8, thanks!
> ---
> drivers/pci/probe.c | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
> index 77b8a145c39b..e21dc71b1907 100644
> --- a/drivers/pci/probe.c
> +++ b/drivers/pci/probe.c
> @@ -909,9 +909,10 @@ static int pci_register_host_bridge(struct pci_host_bridge *bridge)
> goto free;
>
> err = device_register(&bridge->dev);
> - if (err)
> + if (err) {
> put_device(&bridge->dev);
> -
> + goto free;
> + }
> bus->bridge = get_device(&bridge->dev);
> device_enable_async_suspend(bus->bridge);
> pci_set_bus_of_node(bus);
> --
> 2.20.1
>
