luck/tmp_suning_uos_patched
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ACPI: watchdog: Put the watchdog action table after parsing

Browse Source 
The mapped watchdog action table should be released after the
successfully parsing, and the failure path in the driver
initialization.

Signed-off-by: Hanjun Guo <guohanjun@huawei.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
This commit is contained in:
Hanjun Guo 2020-05-07 17:09:14 +08:00 committed by Rafael J. Wysocki
parent f8690227dd
commit fe4e1a576e
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/acpi/acpi_watchdog.c
View File

@ -73,6 +73,7 @@ static const struct acpi_table_wdat *acpi_watchdog_get_wdat(void)
} }
if (acpi_watchdog_uses_rtc(wdat)) { if (acpi_watchdog_uses_rtc(wdat)) {
acpi_put_table((struct acpi_table_header *)wdat);
pr_info("Skipping WDAT on this system because it uses RTC SRAM\n"); pr_info("Skipping WDAT on this system because it uses RTC SRAM\n");
return NULL; return NULL;
} }
@ -117,12 +118,12 @@ void __init acpi_watchdog_init(void)
/* Watchdog disabled by BIOS */ /* Watchdog disabled by BIOS */
if (!(wdat->flags & ACPI_WDAT_ENABLED)) if (!(wdat->flags & ACPI_WDAT_ENABLED))
return; goto fail_put_wdat;
/* Skip legacy PCI WDT devices */ /* Skip legacy PCI WDT devices */
if (wdat->pci_segment != 0xff || wdat->pci_bus != 0xff || if (wdat->pci_segment != 0xff || wdat->pci_bus != 0xff ||
wdat->pci_device != 0xff || wdat->pci_function != 0xff) wdat->pci_device != 0xff || wdat->pci_function != 0xff)
return; goto fail_put_wdat;
INIT_LIST_HEAD(&resource_list); INIT_LIST_HEAD(&resource_list);
@ -188,4 +189,6 @@ void __init acpi_watchdog_init(void)
fail_free_resource_list: fail_free_resource_list:
resource_list_free(&resource_list); resource_list_free(&resource_list);
fail_put_wdat:
acpi_put_table((struct acpi_table_header *)wdat);
} }