Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

treewide: Fix iomap resource size miscalculations

Convert off-by-1 r->end - r->start to resource_size(r)

Signed-off-by: Joe Perches <joe@perches.com>
Acked-by: David Brown <davidb@codeaurora.org>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Acked-by: Florian Fainelli <florian@openwrt.org>
Acked-by: Wim Van Sebroeck <wim@iguana.be>
Acked-by: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>

authored by

Joe Perches and committed by
Jiri Kosina
06794eae b0c3af5e

+5 -7
+2 -4
arch/arm/mach-ux500/mbox-db5500.c
··· 416 416 dev_dbg(&(mbox->pdev->dev), 417 417 "Resource name: %s start: 0x%X, end: 0x%X\n", 418 418 resource->name, resource->start, resource->end); 419 - mbox->virtbase_peer = 420 - ioremap(resource->start, resource->end - resource->start); 419 + mbox->virtbase_peer = ioremap(resource->start, resource_size(resource)); 421 420 if (!mbox->virtbase_peer) { 422 421 dev_err(&(mbox->pdev->dev), "Unable to ioremap peer mbox\n"); 423 422 mbox = NULL; ··· 439 440 dev_dbg(&(mbox->pdev->dev), 440 441 "Resource name: %s start: 0x%X, end: 0x%X\n", 441 442 resource->name, resource->start, resource->end); 442 - mbox->virtbase_local = 443 - ioremap(resource->start, resource->end - resource->start); 443 + mbox->virtbase_local = ioremap(resource->start, resource_size(resource)); 444 444 if (!mbox->virtbase_local) { 445 445 dev_err(&(mbox->pdev->dev), "Unable to ioremap local mbox\n"); 446 446 mbox = NULL;
+1 -1
arch/mips/rb532/gpio.c
··· 185 185 struct resource *r; 186 186 187 187 r = rb532_gpio_reg0_res; 188 - rb532_gpio_chip->regbase = ioremap_nocache(r->start, r->end - r->start); 188 + rb532_gpio_chip->regbase = ioremap_nocache(r->start, resource_size(r)); 189 189 190 190 if (!rb532_gpio_chip->regbase) { 191 191 printk(KERN_ERR "rb532: cannot remap GPIO register 0\n");
+1 -1
drivers/video/msm/mddi.c
··· 679 679 printk(KERN_ERR "mddi: no associated mem resource!\n"); 680 680 return -ENOMEM; 681 681 } 682 - mddi->base = ioremap(resource->start, resource->end - resource->start); 682 + mddi->base = ioremap(resource->start, resource_size(resource)); 683 683 if (!mddi->base) { 684 684 printk(KERN_ERR "mddi: failed to remap base!\n"); 685 685 ret = -EINVAL;
+1 -1
drivers/watchdog/bcm63xx_wdt.c
··· 248 248 return -ENODEV; 249 249 } 250 250 251 - bcm63xx_wdt_device.regs = ioremap_nocache(r->start, r->end - r->start); 251 + bcm63xx_wdt_device.regs = ioremap_nocache(r->start, resource_size(r)); 252 252 if (!bcm63xx_wdt_device.regs) { 253 253 dev_err(&pdev->dev, "failed to remap I/O resources\n"); 254 254 return -ENXIO;