lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

stmmac: use resource_size()

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

Signed-off-by: Dan Carpenter <error27@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Dan Carpenter
2010-03-22 02:11:11 +00:00
committed by David S. Miller
parent d2ba2ed8fe
commit 7c5365bca3
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/net/stmmac/stmmac_main.c
View File

@@ -1685,8 +1685,7 @@ static int stmmac_dvr_probe(struct platform_device *pdev)
} }
pr_info("done!\n"); pr_info("done!\n");
if (!request_mem_region(res->start, (res->end - res->start), if (!request_mem_region(res->start, resource_size(res), pdev->name)) {
pdev->name)) {
pr_err("%s: ERROR: memory allocation failed" pr_err("%s: ERROR: memory allocation failed"
"cannot get the I/O addr 0x%x\n", "cannot get the I/O addr 0x%x\n",
__func__, (unsigned int)res->start); __func__, (unsigned int)res->start);
@@ -1694,7 +1693,7 @@ static int stmmac_dvr_probe(struct platform_device *pdev)
goto out; goto out;
} }
addr = ioremap(res->start, (res->end - res->start)); addr = ioremap(res->start, resource_size(res));
if (!addr) { if (!addr) {
pr_err("%s: ERROR: memory mapping failed\n", __func__); pr_err("%s: ERROR: memory mapping failed\n", __func__);
ret = -ENOMEM; ret = -ENOMEM;
@@ -1774,7 +1773,7 @@ static int stmmac_dvr_probe(struct platform_device *pdev)
out: out:
if (ret < 0) { if (ret < 0) {
platform_set_drvdata(pdev, NULL); 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) if (addr != NULL)
iounmap(addr); iounmap(addr);
} }
@@ -1812,7 +1811,7 @@ static int stmmac_dvr_remove(struct platform_device *pdev)
iounmap((void *)ndev->base_addr); iounmap((void *)ndev->base_addr);
res = platform_get_resource(pdev, IORESOURCE_MEM, 0); 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); free_netdev(ndev);