mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-23 09:19:51 +00:00
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: Dan Carpenter <error27@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
d2ba2ed8fe
commit
7c5365bca3
1 changed files with 5 additions and 6 deletions
|
@ -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,9 +1693,9 @@ 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__);
|
||||
pr_err("%s: ERROR: memory mapping failed\n", __func__);
|
||||
ret = -ENOMEM;
|
||||
goto out;
|
||||
}
|
||||
|
@ -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);
|
||||
|
||||
|
|
Loading…
Reference in a new issue