Merge branch 'pci/misc'

bjorn-helgaas · bjorn-helgaas · commit c29008e61d8e · 2025-09-12T17:11:41.000-05:00
- Fix whitespace issues (Li Jun)

- Fix pci_acpi_preserve_config() memory leak (Nirmoy Das)

* pci/misc:
  PCI/ACPI: Fix pci_acpi_preserve_config() memory leak
diff --git a/drivers/pci/pci-acpi.c b/drivers/pci/pci-acpi.c
@@ -122,6 +122,8 @@ phys_addr_t acpi_pci_root_get_mcfg_addr(acpi_handle handle)
 
 bool pci_acpi_preserve_config(struct pci_host_bridge *host_bridge)
 {
+	bool ret = false;
+
 	if (ACPI_HANDLE(&host_bridge->dev)) {
 		union acpi_object *obj;
 
@@ -135,11 +137,11 @@ bool pci_acpi_preserve_config(struct pci_host_bridge *host_bridge)
 					      1, DSM_PCI_PRESERVE_BOOT_CONFIG,
 					      NULL, ACPI_TYPE_INTEGER);
 		if (obj && obj->integer.value == 0)
-			return true;
+			ret = true;
 		ACPI_FREE(obj);
 	}
 
-	return false;
+	return ret;
 }
 
 /* _HPX PCI Setting Record (Type 0); same as _HPP */

Original file line number	Diff line number	Diff line change
`@@ -122,6 +122,8 @@ phys_addr_t acpi_pci_root_get_mcfg_addr(acpi_handle handle)`
`122`	`122`
`123`	`123`	`bool pci_acpi_preserve_config(struct pci_host_bridge *host_bridge)`
`124`	`124`	`{`
	`125`	`+ bool ret = false;`
	`126`	`+`
`125`	`127`	`if (ACPI_HANDLE(&host_bridge->dev)) {`
`126`	`128`	`union acpi_object *obj;`
`127`	`129`
`@@ -135,11 +137,11 @@ bool pci_acpi_preserve_config(struct pci_host_bridge *host_bridge)`
`135`	`137`	`1, DSM_PCI_PRESERVE_BOOT_CONFIG,`
`136`	`138`	`NULL, ACPI_TYPE_INTEGER);`
`137`	`139`	`if (obj && obj->integer.value == 0)`
`138`		`- return true;`
	`140`	`+ ret = true;`
`139`	`141`	`ACPI_FREE(obj);`
`140`	`142`	`}`
`141`	`143`
`142`		`- return false;`
	`144`	`+ return ret;`
`143`	`145`	`}`
`144`	`146`
`145`	`147`	`/* _HPX PCI Setting Record (Type 0); same as _HPP */`