diff --git a/[refs] b/[refs] index 1c5ea367b6a4..83f1c151f55d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 38b7a2ae0ad3e29e1881b82c0f421ba5db148e3d +refs/heads/master: 88cf81fc8944a6892db104caaa490885d48b959c diff --git a/trunk/drivers/rapidio/rio.c b/trunk/drivers/rapidio/rio.c index 68cf0c99138a..7b5080c45569 100644 --- a/trunk/drivers/rapidio/rio.c +++ b/trunk/drivers/rapidio/rio.c @@ -1159,11 +1159,11 @@ int __devinit rio_init_mports(void) list_for_each_entry(port, &rio_mports, node) { if (!request_mem_region(port->iores.start, - port->iores.end - port->iores.start, + resource_size(&port->iores), port->name)) { printk(KERN_ERR "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; goto out; }