Commit 88cf81fc authored by Dan Carpenter's avatar Dan Carpenter Committed by Linus Torvalds

rapidio: use resource_size()

The size calculation is done incorrectly here because it should include
both the start and end (end - start + 1).  It's easiest to just use
resource_size() which does the right thing.

I was worried there was something non-standard going on because the
printk() subtracts "end - 1", but the rest of the file uses the normal
resource size calculations.  This function is only called from
fsl_rio_setup() in arch/powerpc/sysdev/fsl_rio.c and the calculation
there is also:

	port->iores.start = law_start;
	port->iores.end = law_start + law_size - 1;

So I think this is the correct fix.
Signed-off-by: default avatarDan Carpenter <error27@gmail.com>
Cc: Alexandre Bounine <alexandre.bounine@idt.com>
Acked-by: default avatarLi Yang <leoli@freescale.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 38b7a2ae
...@@ -1159,11 +1159,11 @@ int __devinit rio_init_mports(void) ...@@ -1159,11 +1159,11 @@ int __devinit rio_init_mports(void)
list_for_each_entry(port, &rio_mports, node) { list_for_each_entry(port, &rio_mports, node) {
if (!request_mem_region(port->iores.start, if (!request_mem_region(port->iores.start,
port->iores.end - port->iores.start, resource_size(&port->iores),
port->name)) { port->name)) {
printk(KERN_ERR printk(KERN_ERR
"RIO: Error requesting master port region 0x%016llx-0x%016llx\n", "RIO: Error requesting master port region 0x%016llx-0x%016llx\n",
(u64)port->iores.start, (u64)port->iores.end - 1); (u64)port->iores.start, (u64)port->iores.end);
rc = -ENOMEM; rc = -ENOMEM;
goto out; goto out;
} }
......
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