Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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()"
+10
-13
+10
-13
drivers/pci/pci-acpi.c
+10
-13
drivers/pci/pci-acpi.c
···
1676
1676
return NULL;
1677
1677
1678
1678
root_ops = kzalloc(sizeof(*root_ops), GFP_KERNEL);
1679
-
if (!root_ops)
1680
-
goto free_ri;
1679
+
if (!root_ops) {
1680
+
kfree(ri);
1681
+
return NULL;
1682
+
}
1681
1683
1682
1684
ri->cfg = pci_acpi_setup_ecam_mapping(root);
1683
-
if (!ri->cfg)
1684
-
goto free_root_ops;
1685
+
if (!ri->cfg) {
1686
+
kfree(ri);
1687
+
kfree(root_ops);
1688
+
return NULL;
1689
+
}
1685
1690
1686
1691
root_ops->release_info = pci_acpi_generic_release_info;
1687
1692
root_ops->prepare_resources = pci_acpi_root_prepare_resources;
1688
1693
root_ops->pci_ops = (struct pci_ops *)&ri->cfg->ops->pci_ops;
1689
1694
bus = acpi_pci_root_create(root, root_ops, &ri->common, ri->cfg);
1690
1695
if (!bus)
1691
-
goto free_cfg;
1696
+
return NULL;
1692
1697
1693
1698
/* If we must preserve the resource configuration, claim now */
1694
1699
host = pci_find_host_bridge(bus);
···
1710
1705
pcie_bus_configure_settings(child);
1711
1706
1712
1707
return bus;
1713
-
1714
-
free_cfg:
1715
-
pci_ecam_free(ri->cfg);
1716
-
free_root_ops:
1717
-
kfree(root_ops);
1718
-
free_ri:
1719
-
kfree(ri);
1720
-
return NULL;
1721
1708
}
1722
1709
1723
1710
void pcibios_add_bus(struct pci_bus *bus)