diff options
| author | Dan Carpenter <error27@gmail.com> | 2010-03-22 02:11:11 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-03-22 18:33:10 -0700 |
| commit | 7c5365bca33194092e0a094b34b268283022a1a1 (patch) | |
| tree | 0b9aa0493c5b074c083d00ad218ff6053708273e | |
| parent | d2ba2ed8fe3aa796a671a6922119d7171bb49515 (diff) | |
| download | talos-obmc-linux-7c5365bca33194092e0a094b34b268283022a1a1.tar.gz talos-obmc-linux-7c5365bca33194092e0a094b34b268283022a1a1.zip | |
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>
| -rw-r--r-- | drivers/net/stmmac/stmmac_main.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/net/stmmac/stmmac_main.c b/drivers/net/stmmac/stmmac_main.c index a6733612d64a..92bef30de092 100644 --- a/drivers/net/stmmac/stmmac_main.c +++ b/drivers/net/stmmac/stmmac_main.c @@ -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); |
