From d145d6945c9108e01ca3705efc7ba37d23fee0a4 Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Mon, 14 Dec 2009 16:13:13 -0500 Subject: [PATCH] --- yaml --- r: 195836 b: refs/heads/master c: d8bc55553c416c877267c1efd65b099164acbe3f h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/mtd/nand/davinci_nand.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 382cc97f3497..607a5602e96b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 440d4f9fb62dad0d5ed1635d099cedaa7a25d96d +refs/heads/master: d8bc55553c416c877267c1efd65b099164acbe3f diff --git a/trunk/drivers/mtd/nand/davinci_nand.c b/trunk/drivers/mtd/nand/davinci_nand.c index fe3eba87de40..e2eeaf1e51a3 100644 --- a/trunk/drivers/mtd/nand/davinci_nand.c +++ b/trunk/drivers/mtd/nand/davinci_nand.c @@ -566,8 +566,8 @@ static int __init nand_davinci_probe(struct platform_device *pdev) goto err_nomem; } - vaddr = ioremap(res1->start, res1->end - res1->start); - base = ioremap(res2->start, res2->end - res2->start); + vaddr = ioremap(res1->start, resource_size(res1)); + base = ioremap(res2->start, resource_size(res2)); if (!vaddr || !base) { dev_err(&pdev->dev, "ioremap failed\n"); ret = -EINVAL;