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

Commit 7c5365bc authored by Dan Carpenter's avatar Dan Carpenter Committed by David S. Miller
Browse files

stmmac: use resource_size() 



The size calculation is not correct.  It should be end - start + 1.
Use resource_size() to calculate it instead.

Signed-off-by: default avatarDan Carpenter <error27@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d2ba2ed8

drivers/net/stmmac/stmmac_main.c

+5 −6
Original line number Diff line number Diff line
@@ -1685,8 +1685,7 @@ static int stmmac_dvr_probe(struct platform_device *pdev) 
	}

	pr_info("done!\n");



	if (!request_mem_region(res->start, (res->end - res->start),

				pdev->name)) {

	if (!request_mem_region(res->start, resource_size(res),	pdev->name)) {

		pr_err("%s: ERROR: memory allocation failed"

		       "cannot get the I/O addr 0x%x\n",

		       __func__, (unsigned int)res->start);
@@ -1694,7 +1693,7 @@ static int stmmac_dvr_probe(struct platform_device *pdev) 
		goto out;

	}



	addr = ioremap(res->start, (res->end - res->start));

	addr = ioremap(res->start, resource_size(res));

	if (!addr) {

		pr_err("%s: ERROR: memory mapping failed\n", __func__);

		ret = -ENOMEM;
@@ -1774,7 +1773,7 @@ static int stmmac_dvr_probe(struct platform_device *pdev) 
out:

	if (ret < 0) {

		platform_set_drvdata(pdev, NULL);

		release_mem_region(res->start, (res->end - res->start));

		release_mem_region(res->start, resource_size(res));

		if (addr != NULL)

			iounmap(addr);

	}
@@ -1812,7 +1811,7 @@ static int stmmac_dvr_remove(struct platform_device *pdev) 


	iounmap((void *)ndev->base_addr);

	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	release_mem_region(res->start, (res->end - res->start));

	release_mem_region(res->start, resource_size(res));



	free_netdev(ndev);