leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

stmmac: use resource_size()

Browse Source 
Resource size should be calculated as end - start + 1 because we start
counting at zero.  I changed the code to resource_size() to do the 
calculation.

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-04-07 21:50:08 -07:00 committed by David S. Miller
parent ddd0451fc8
commit b62226826b
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1685,7 +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",
@ -1694,9 +1694,9 @@ 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;
goto out; goto out;
} }
@ -1774,7 +1774,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 +1812,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);