diff mbox

ftmac100: use resource_size()

Message ID 20110319043915.GB2008@bicker
State Accepted, archived
Delegated to: David Miller
Headers show

Commit Message

Dan Carpenter March 19, 2011, 4:39 a.m. UTC
The calculation is off-by-one.  It should be "end - start + 1".  This
patch fixes it to use resource_size() instead.  Oddly, the code already
uses resource size correctly a couple lines earlier when it calls
request_mem_region() for this memory.

Signed-off-by: Dan Carpenter <error27@gmail.com>

--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Comments

David Miller March 19, 2011, 4:53 a.m. UTC | #1
From: Dan Carpenter <error27@gmail.com>
Date: Sat, 19 Mar 2011 07:39:15 +0300

> The calculation is off-by-one.  It should be "end - start + 1".  This
> patch fixes it to use resource_size() instead.  Oddly, the code already
> uses resource size correctly a couple lines earlier when it calls
> request_mem_region() for this memory.
> 
> Signed-off-by: Dan Carpenter <error27@gmail.com>

Applied, thanks for fixing this Dan.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Po-Yu Chuang March 19, 2011, 5:05 a.m. UTC | #2
Hi Dan,

On Sat, Mar 19, 2011 at 12:39 PM, Dan Carpenter <error27@gmail.com> wrote:
> The calculation is off-by-one.  It should be "end - start + 1".  This
> patch fixes it to use resource_size() instead.  Oddly, the code already
> uses resource size correctly a couple lines earlier when it calls
> request_mem_region() for this memory.
>
> Signed-off-by: Dan Carpenter <error27@gmail.com>
>
> diff --git a/drivers/net/ftmac100.c b/drivers/net/ftmac100.c
> index 1d6f4b8..a316619 100644
> --- a/drivers/net/ftmac100.c
> +++ b/drivers/net/ftmac100.c
> @@ -1102,7 +1102,7 @@ static int ftmac100_probe(struct platform_device *pdev)
>                goto err_req_mem;
>        }
>
> -       priv->base = ioremap(res->start, res->end - res->start);
> +       priv->base = ioremap(res->start, resource_size(res));
>        if (!priv->base) {
>                dev_err(&pdev->dev, "Failed to ioremap ethernet registers\n");
>                err = -EIO;

Ah, I incautiously missed that line when code review.

Thanks,
Po-Yu Chuang
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/drivers/net/ftmac100.c b/drivers/net/ftmac100.c
index 1d6f4b8..a316619 100644
--- a/drivers/net/ftmac100.c
+++ b/drivers/net/ftmac100.c
@@ -1102,7 +1102,7 @@  static int ftmac100_probe(struct platform_device *pdev)
 		goto err_req_mem;
 	}
 
-	priv->base = ioremap(res->start, res->end - res->start);
+	priv->base = ioremap(res->start, resource_size(res));
 	if (!priv->base) {
 		dev_err(&pdev->dev, "Failed to ioremap ethernet registers\n");
 		err = -EIO;