From 69d29258bb54c0b2d1ae356b48d94e93c5e995f7 Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Wed, 30 Jun 2010 13:12:01 -0700 Subject: [PATCH] --- yaml --- r: 203237 b: refs/heads/master c: 7e307c7ad5340b226966da6e564ec7f717da3adb h: refs/heads/master i: 203235: 806dcee0d8a4a2ddb44ddcbb4cc5770906eb139a v: v3 --- [refs] | 2 +- trunk/drivers/net/cpmac.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 3ba1763edb0d..b343a2c087b1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 504f85c9d05f7c605306e808f0d835fe11bfd18d +refs/heads/master: 7e307c7ad5340b226966da6e564ec7f717da3adb diff --git a/trunk/drivers/net/cpmac.c b/trunk/drivers/net/cpmac.c index 3c58db595285..1756d28250d4 100644 --- a/trunk/drivers/net/cpmac.c +++ b/trunk/drivers/net/cpmac.c @@ -964,7 +964,7 @@ 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); @@ -972,7 +972,7 @@ static int cpmac_open(struct net_device *dev) 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", @@ -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; @@ -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) {