Merge tag 'io_uring-2023-01-06' of git://git.kernel.dk/linux

[platform/kernel/linux-rpi.git] / arch / loongarch / pci / acpi.c

diff --git a/arch/loongarch/pci/acpi.c b/arch/loongarch/pci/acpi.c
index 8235ec9..365f7de 100644 (file)
--- a/arch/loongarch/pci/acpi.c
+++ b/arch/loongarch/pci/acpi.c
@@ -26,9 +26,12 @@ void pcibios_add_bus(struct pci_bus *bus)
 
 int pcibios_root_bridge_prepare(struct pci_host_bridge *bridge)
 {
-       struct pci_config_window *cfg = bridge->bus->sysdata;
-       struct acpi_device *adev = to_acpi_device(cfg->parent);
+       struct acpi_device *adev = NULL;
        struct device *bus_dev = &bridge->bus->dev;
+       struct pci_config_window *cfg = bridge->bus->sysdata;
+
+       if (!acpi_disabled)
+               adev = to_acpi_device(cfg->parent);
 
        ACPI_COMPANION_SET(&bridge->dev, adev);
        set_dev_node(bus_dev, pa_to_nid(cfg->res.start));