Skip to content

Commit

Permalink
cpmac: use resource_size()
Browse files Browse the repository at this point in the history
The original code is off by one because we should start counting at
zero.  So the size of the resource is end - start + 1.  I switched it to
use resource_size() to do the calculation.

Signed-off-by: Dan Carpenter <error27@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Dan Carpenter authored and David S. Miller committed Jun 30, 2010
1 parent 504f85c commit 7e307c7
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions drivers/net/cpmac.c
Original file line number Diff line number Diff line change
Expand Up @@ -964,15 +964,15 @@ static int cpmac_open(struct net_device *dev)
struct sk_buff *skb;

mem = platform_get_resource_byname(priv->pdev, IORESOURCE_MEM, "regs");
if (!request_mem_region(mem->start, mem->end - mem->start, dev->name)) {
if (!request_mem_region(mem->start, resource_size(mem), dev->name)) {
if (netif_msg_drv(priv))
printk(KERN_ERR "%s: failed to request registers\n",
dev->name);
res = -ENXIO;
goto fail_reserve;
}

priv->regs = ioremap(mem->start, mem->end - mem->start);
priv->regs = ioremap(mem->start, resource_size(mem));
if (!priv->regs) {
if (netif_msg_drv(priv))
printk(KERN_ERR "%s: failed to remap registers\n",
Expand Down Expand Up @@ -1049,7 +1049,7 @@ static int cpmac_open(struct net_device *dev)
iounmap(priv->regs);

fail_remap:
release_mem_region(mem->start, mem->end - mem->start);
release_mem_region(mem->start, resource_size(mem));

fail_reserve:
return res;
Expand Down Expand Up @@ -1077,7 +1077,7 @@ static int cpmac_stop(struct net_device *dev)
free_irq(dev->irq, dev);
iounmap(priv->regs);
mem = platform_get_resource_byname(priv->pdev, IORESOURCE_MEM, "regs");
release_mem_region(mem->start, mem->end - mem->start);
release_mem_region(mem->start, resource_size(mem));
priv->rx_head = &priv->desc_ring[CPMAC_QUEUES];
for (i = 0; i < priv->ring_size; i++) {
if (priv->rx_head[i].skb) {
Expand Down

0 comments on commit 7e307c7

Please sign in to comment.