stmmac: use resource_size()
Subsystems (4)
PATCH 1/1 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 <[email protected]>
drivers/net/stmmac/stmmac_main.c +5 -6
@@ -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);
Hi Dan
Thanks, the patch can also applied against the net-next driver and it's ok.
Regards,
Giuseppe
Quoted 50 lines · Dan Carpenter
The size calculation is not correct. It should be end - start + 1. Use
resource_size()to calculate it instead.Signed-off-by Dan Carpenter <[email protected]>drivers/net/stmmac/stmmac_main.c +5
-6@@ -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);
From: Giuseppe CAVALLARO <[email protected]>
Date: Mon, 22 Mar 2010 16:15:03 +0100
Quoted 2 lines
Hi Dan
Thanks, the patch can also applied against the net-next driver and it's ok.
Applied, thanks everyone.