lkml.org 
[lkml]   [2020]   [Jun]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.7 204/388] PCI: Fix pci_register_host_bridge() device_register() error handling
    Date
    From: Rob Herring <robh@kernel.org>

    [ Upstream commit 1b54ae8327a4d630111c8d88ba7906483ec6010b ]

    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")
    Link: https://lore.kernel.org/r/20200513223859.11295-1-robh@kernel.org
    Signed-off-by: Rob Herring <robh@kernel.org>
    Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
    Reviewed-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
    Reviewed-by: Arnd Bergmann <arnd@arndb.de>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    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.25.1
    \
     
     \ /
      Last update: 2020-06-18 04:37    [W:2.027 / U:0.460 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site