diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-01-25 16:46:14 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-01-25 16:46:14 +1100 |
| commit | 341a703b21883fc6d0eaf960aad9d161b0354ef8 (patch) | |
| tree | 20d0997403d03be27e0061273a11e3f57081e700 | |
| parent | 8b1340afacf7ec9931997cdc7059280c11c5c4b5 (diff) | |
Revert "Input: xilinx_ps2 - use resource_size"
This reverts commit cc7bbfa322b48be82b1c86a104433d4ac349da79.
| -rw-r--r-- | drivers/input/serio/xilinx_ps2.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/input/serio/xilinx_ps2.c b/drivers/input/serio/xilinx_ps2.c index e3b9c0216ac8..78c64fb8a4b0 100644 --- a/drivers/input/serio/xilinx_ps2.c +++ b/drivers/input/serio/xilinx_ps2.c @@ -270,7 +270,7 @@ static int __devinit xps2_of_probe(struct of_device *ofdev, drvdata->irq = r_irq.start; phys_addr = r_mem.start; - remap_size = resource_size(r_mem); + remap_size = r_mem.end - r_mem.start + 1; if (!request_mem_region(phys_addr, remap_size, DRIVER_NAME)) { dev_err(dev, "Couldn't lock memory region at 0x%08llX\n", (unsigned long long)phys_addr); @@ -344,7 +344,7 @@ static int __devexit xps2_of_remove(struct of_device *of_dev) if (of_address_to_resource(of_dev->node, 0, &r_mem)) dev_err(dev, "invalid address\n"); else - release_mem_region(r_mem.start, resource_size(r_mem)); + release_mem_region(r_mem.start, r_mem.end - r_mem.start + 1); kfree(drvdata); |