diff options
| author | Rafael J. Wysocki | 2018-03-22 23:42:08 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki | 2018-03-22 23:42:08 +0100 |
| commit | 594fdbaab739f82b3a712b88beb483ca1ca250ee (patch) | |
| tree | 66738bb357a997fcb41c0da10b950683e49265a5 /drivers/acpi | |
| parent | Revert "ACPI / battery: Add quirk for Asus GL502VSK and UX305LA" (diff) | |
| parent | ACPI / watchdog: Fix off-by-one error at resource assignment (diff) | |
| download | kernel-qcow2-linux-594fdbaab739f82b3a712b88beb483ca1ca250ee.tar.gz kernel-qcow2-linux-594fdbaab739f82b3a712b88beb483ca1ca250ee.tar.xz kernel-qcow2-linux-594fdbaab739f82b3a712b88beb483ca1ca250ee.zip | |
Merge branch 'acpi-wdat'
* acpi-wdat:
ACPI / watchdog: Fix off-by-one error at resource assignment
Diffstat (limited to 'drivers/acpi')
| -rw-r--r-- | drivers/acpi/acpi_watchdog.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/acpi/acpi_watchdog.c b/drivers/acpi/acpi_watchdog.c index 11b113f8e367..ebb626ffb5fa 100644 --- a/drivers/acpi/acpi_watchdog.c +++ b/drivers/acpi/acpi_watchdog.c @@ -74,10 +74,10 @@ void __init acpi_watchdog_init(void) res.start = gas->address; if (gas->space_id == ACPI_ADR_SPACE_SYSTEM_MEMORY) { 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) { res.flags = IORESOURCE_IO; - res.end = res.start + gas->access_width; + res.end = res.start + gas->access_width - 1; } else { pr_warn("Unsupported address space: %u\n", gas->space_id); |