Skip to content

L
linux
Commit 594fdbaa authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files
Options

Merge branch 'acpi-wdat' 

* acpi-wdat:
  ACPI / watchdog: Fix off-by-one error at resource assignment
parents 82bf43b2 b1abf6fc
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
drivers/acpi/acpi_watchdog.c
View file @ 594fdbaa
...@@ -74,10 +74,10 @@ void __init acpi_watchdog_init(void) ...@@ -74,10 +74,10 @@ void __init acpi_watchdog_init(void)
res.start = gas->address; res.start = gas->address;
if (gas->space_id == ACPI_ADR_SPACE_SYSTEM_MEMORY) { if (gas->space_id == ACPI_ADR_SPACE_SYSTEM_MEMORY) {
res.flags = IORESOURCE_MEM; res.flags = IORESOURCE_MEM;
res.end = res.start + ALIGN(gas->access_width, 4); res.end = res.start + ALIGN(gas->access_width, 4) - 1;
} else if (gas->space_id == ACPI_ADR_SPACE_SYSTEM_IO) { } else if (gas->space_id == ACPI_ADR_SPACE_SYSTEM_IO) {
res.flags = IORESOURCE_IO; res.flags = IORESOURCE_IO;
res.end = res.start + gas->access_width; res.end = res.start + gas->access_width - 1;
} else { } else {
pr_warn("Unsupported address space: %u\n", pr_warn("Unsupported address space: %u\n",
gas->space_id); gas->space_id);
......
drivers/watchdog/wdat_wdt.c
View file @ 594fdbaa
...@@ -392,7 +392,7 @@ static int wdat_wdt_probe(struct platform_device *pdev) ...@@ -392,7 +392,7 @@ static int wdat_wdt_probe(struct platform_device *pdev)
memset(&r, 0, sizeof(r)); memset(&r, 0, sizeof(r));
r.start = gas->address; r.start = gas->address;
r.end = r.start + gas->access_width; r.end = r.start + gas->access_width - 1;
if (gas->space_id == ACPI_ADR_SPACE_SYSTEM_MEMORY) { if (gas->space_id == ACPI_ADR_SPACE_SYSTEM_MEMORY) {
r.flags = IORESOURCE_MEM; r.flags = IORESOURCE_MEM;
} else if (gas->space_id == ACPI_ADR_SPACE_SYSTEM_IO) { } else if (gas->space_id == ACPI_ADR_SPACE_SYSTEM_IO) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7