diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2018-03-22 23:42:08 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2018-03-22 23:42:08 +0100 |
| commit | 594fdbaab739f82b3a712b88beb483ca1ca250ee (patch) | |
| tree | 66738bb357a997fcb41c0da10b950683e49265a5 | |
| parent | 82bf43b291888599b4079244d12195d214086fa4 (diff) | |
| parent | b1abf6fc49829d89660c961fafe3f90f3d843c55 (diff) | |
| download | mm-594fdbaab739f82b3a712b88beb483ca1ca250ee.tar.gz | |
Merge branch 'acpi-wdat'
* acpi-wdat:
ACPI / watchdog: Fix off-by-one error at resource assignment
| -rw-r--r-- | drivers/acpi/acpi_watchdog.c | 4 | ||||
| -rw-r--r-- | drivers/watchdog/wdat_wdt.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/acpi/acpi_watchdog.c b/drivers/acpi/acpi_watchdog.c index 11b113f8e36741..ebb626ffb5fa2d 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); diff --git a/drivers/watchdog/wdat_wdt.c b/drivers/watchdog/wdat_wdt.c index 6d1fbda0f461ca..0da9943d405f8f 100644 --- a/drivers/watchdog/wdat_wdt.c +++ b/drivers/watchdog/wdat_wdt.c @@ -392,7 +392,7 @@ static int wdat_wdt_probe(struct platform_device *pdev) memset(&r, 0, sizeof(r)); 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) { r.flags = IORESOURCE_MEM; } else if (gas->space_id == ACPI_ADR_SPACE_SYSTEM_IO) { |