Usually, resizing BARs requires releasing bridge windows in order to
resize it to fit a larger BAR into the window. This is not always the
case, however, FW could have made the window large enough to accomodate
larger BAR as is, or the user might prefer to shrink a BAR to make more
space for another Resizable BAR.

Thus, replace the check that requires that at least one bridge window
was released with a check that simply ensures bridge is not NULL.

Signed-off-by: Ilpo Järvinen <[email protected]>
---
 drivers/pci/setup-bus.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c
index d58f025aeaff..1a3d54563854 100644
--- a/drivers/pci/setup-bus.c
+++ b/drivers/pci/setup-bus.c
@@ -2424,7 +2424,7 @@ int pbus_reassign_bridge_resources(struct pci_bus *bus, 
struct resource *res)
 {
        unsigned long type = res->flags;
        struct pci_dev_resource *dev_res;
-       struct pci_dev *bridge;
+       struct pci_dev *bridge = NULL;
        LIST_HEAD(saved);
        LIST_HEAD(added);
        LIST_HEAD(failed);
@@ -2459,10 +2459,8 @@ int pbus_reassign_bridge_resources(struct pci_bus *bus, 
struct resource *res)
                bus = bus->parent;
        }
 
-       if (list_empty(&saved)) {
-               up_read(&pci_bus_sem);
+       if (!bridge)
                return -ENOENT;
-       }
 
        __pci_bus_size_bridges(bridge->subordinate, &added);
        __pci_bridge_assign_resources(bridge, &added, &failed);
-- 
2.39.5

Reply via email to