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

Merge branch 'acpi-wdat' 

* acpi-wdat:
  ACPI / watchdog: Fix off-by-one error at resource assignment
parents 82bf43b2 b1abf6fc

drivers/acpi/acpi_watchdog.c

+2 −2
Original line number Diff line number Diff line
@@ -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);

drivers/watchdog/wdat_wdt.c

+1 −1
Original line number Diff line number Diff line
@@ -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) {