Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 06794eae authored by Joe Perches's avatar Joe Perches Committed by Jiri Kosina
Browse files

treewide: Fix iomap resource size miscalculations 



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

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Acked-by: default avatarDavid Brown <davidb@codeaurora.org>
Acked-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Acked-by: default avatarFlorian Fainelli <florian@openwrt.org>
Acked-by: default avatarWim Van Sebroeck <wim@iguana.be>
Acked-by: default avatarRalf Baechle <ralf@linux-mips.org>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent b0c3af5e

arch/arm/mach-ux500/mbox-db5500.c

+2 −4
Original line number Diff line number Diff line
@@ -416,8 +416,7 @@ struct mbox *mbox_setup(u8 mbox_id, mbox_recv_cb_t *mbox_cb, void *priv) 
	dev_dbg(&(mbox->pdev->dev),

		"Resource name: %s start: 0x%X, end: 0x%X\n",

		resource->name, resource->start, resource->end);

	mbox->virtbase_peer =

		ioremap(resource->start, resource->end - resource->start);

	mbox->virtbase_peer = ioremap(resource->start, resource_size(resource));

	if (!mbox->virtbase_peer) {

		dev_err(&(mbox->pdev->dev), "Unable to ioremap peer mbox\n");

		mbox = NULL;
@@ -440,8 +439,7 @@ struct mbox *mbox_setup(u8 mbox_id, mbox_recv_cb_t *mbox_cb, void *priv) 
	dev_dbg(&(mbox->pdev->dev),

		"Resource name: %s start: 0x%X, end: 0x%X\n",

		resource->name, resource->start, resource->end);

	mbox->virtbase_local =

		ioremap(resource->start, resource->end - resource->start);

	mbox->virtbase_local = ioremap(resource->start, resource_size(resource));

	if (!mbox->virtbase_local) {

		dev_err(&(mbox->pdev->dev), "Unable to ioremap local mbox\n");

		mbox = NULL;

arch/mips/rb532/gpio.c

+1 −1
Original line number Diff line number Diff line
@@ -185,7 +185,7 @@ int __init rb532_gpio_init(void) 
	struct resource *r;



	r = rb532_gpio_reg0_res;

	rb532_gpio_chip->regbase = ioremap_nocache(r->start, r->end - r->start);

	rb532_gpio_chip->regbase = ioremap_nocache(r->start, resource_size(r));



	if (!rb532_gpio_chip->regbase) {

		printk(KERN_ERR "rb532: cannot remap GPIO register 0\n");

drivers/video/msm/mddi.c

+1 −1
Original line number Diff line number Diff line
@@ -679,7 +679,7 @@ static int __devinit mddi_probe(struct platform_device *pdev) 
		printk(KERN_ERR "mddi: no associated mem resource!\n");

		return -ENOMEM;

	}

	mddi->base = ioremap(resource->start, resource->end - resource->start);

	mddi->base = ioremap(resource->start, resource_size(resource));

	if (!mddi->base) {

		printk(KERN_ERR "mddi: failed to remap base!\n");

		ret = -EINVAL;

drivers/watchdog/bcm63xx_wdt.c

+1 −1
Original line number Diff line number Diff line
@@ -248,7 +248,7 @@ static int __devinit bcm63xx_wdt_probe(struct platform_device *pdev) 
		return -ENODEV;

	}



	bcm63xx_wdt_device.regs = ioremap_nocache(r->start, r->end - r->start);

	bcm63xx_wdt_device.regs = ioremap_nocache(r->start, resource_size(r));

	if (!bcm63xx_wdt_device.regs) {

		dev_err(&pdev->dev, "failed to remap I/O resources\n");

		return -ENXIO;