Commit594fdba

committed

Merge branch 'acpi-wdat'

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

2 parents82bf43b +b1abf6f commit594fdbaCopy full SHA for 594fdba

File tree

-3

lines changed

-3

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -74,10 +74,10 @@ void __init acpi_watchdog_init(void)`
`74`	`74`	`res.start=gas->address;`
`75`	`75`	`if (gas->space_id==ACPI_ADR_SPACE_SYSTEM_MEMORY) {`
`76`	`76`	`res.flags=IORESOURCE_MEM;`
`77`		`-res.end=res.start+ALIGN(gas->access_width,4);`
	`77`	`+res.end=res.start+ALIGN(gas->access_width,4)-1;`
`78`	`78`	`}elseif (gas->space_id==ACPI_ADR_SPACE_SYSTEM_IO) {`
`79`	`79`	`res.flags=IORESOURCE_IO;`
`80`		`-res.end=res.start+gas->access_width;`
	`80`	`+res.end=res.start+gas->access_width-1;`
`81`	`81`	`}else {`
`82`	`82`	`pr_warn("Unsupported address space: %u\n",`
`83`	`83`	`gas->space_id);`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -392,7 +392,7 @@ static int wdat_wdt_probe(struct platform_device *pdev)`
`392`	`392`
`393`	`393`	`memset(&r,0,sizeof(r));`
`394`	`394`	`r.start=gas->address;`
`395`		`-r.end=r.start+gas->access_width;`
	`395`	`+r.end=r.start+gas->access_width-1;`
`396`	`396`	`if (gas->space_id==ACPI_ADR_SPACE_SYSTEM_MEMORY) {`
`397`	`397`	`r.flags=IORESOURCE_MEM;`
`398`	`398`	`}elseif (gas->space_id==ACPI_ADR_SPACE_SYSTEM_IO) {`

Comments

(0)