Commit 35e261cd authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'acpi-6.16-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm 

Pull ACPI fix from Rafael Wysocki:
 "Revert a commit that attempted to fix a memory leak in an error code
  path and introduced a different issue (Zhe Qiao)"

* tag 'acpi-6.16-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  Revert "PCI/ACPI: Fix allocated memory release on error in pci_acpi_scan_root()"
parents e5403415 2b8be57f

drivers/pci/pci-acpi.c

+10 −13
Original line number Diff line number Diff line
@@ -1676,19 +1676,24 @@ struct pci_bus *pci_acpi_scan_root(struct acpi_pci_root *root) 
		return NULL;



	root_ops = kzalloc(sizeof(*root_ops), GFP_KERNEL);

	if (!root_ops)

		goto free_ri;

	if (!root_ops) {

		kfree(ri);

		return NULL;

	}



	ri->cfg = pci_acpi_setup_ecam_mapping(root);

	if (!ri->cfg)

		goto free_root_ops;

	if (!ri->cfg) {

		kfree(ri);

		kfree(root_ops);

		return NULL;

	}



	root_ops->release_info = pci_acpi_generic_release_info;

	root_ops->prepare_resources = pci_acpi_root_prepare_resources;

	root_ops->pci_ops = (struct pci_ops *)&ri->cfg->ops->pci_ops;

	bus = acpi_pci_root_create(root, root_ops, &ri->common, ri->cfg);

	if (!bus)

		goto free_cfg;

		return NULL;



	/* If we must preserve the resource configuration, claim now */

	host = pci_find_host_bridge(bus);
@@ -1705,14 +1710,6 @@ struct pci_bus *pci_acpi_scan_root(struct acpi_pci_root *root) 
		pcie_bus_configure_settings(child);



	return bus;



free_cfg:

	pci_ecam_free(ri->cfg);

free_root_ops:

	kfree(root_ops);

free_ri:

	kfree(ri);

	return NULL;

}



void pcibios_add_bus(struct pci_bus *bus)