diff options
Diffstat (limited to 'drivers/mtd/nand/davinci_nand.c')
-rw-r--r-- | drivers/mtd/nand/davinci_nand.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/mtd/nand/davinci_nand.c b/drivers/mtd/nand/davinci_nand.c index 76e2dc8e62f..9c9d893affe 100644 --- a/drivers/mtd/nand/davinci_nand.c +++ b/drivers/mtd/nand/davinci_nand.c | |||
@@ -567,8 +567,8 @@ static int __init nand_davinci_probe(struct platform_device *pdev) | |||
567 | goto err_nomem; | 567 | goto err_nomem; |
568 | } | 568 | } |
569 | 569 | ||
570 | vaddr = ioremap(res1->start, res1->end - res1->start); | 570 | vaddr = ioremap(res1->start, resource_size(res1)); |
571 | base = ioremap(res2->start, res2->end - res2->start); | 571 | base = ioremap(res2->start, resource_size(res2)); |
572 | if (!vaddr || !base) { | 572 | if (!vaddr || !base) { |
573 | dev_err(&pdev->dev, "ioremap failed\n"); | 573 | dev_err(&pdev->dev, "ioremap failed\n"); |
574 | ret = -EINVAL; | 574 | ret = -EINVAL; |
@@ -691,7 +691,7 @@ static int __init nand_davinci_probe(struct platform_device *pdev) | |||
691 | spin_unlock_irq(&davinci_nand_lock); | 691 | spin_unlock_irq(&davinci_nand_lock); |
692 | 692 | ||
693 | /* Scan to find existence of the device(s) */ | 693 | /* Scan to find existence of the device(s) */ |
694 | ret = nand_scan_ident(&info->mtd, pdata->mask_chipsel ? 2 : 1); | 694 | ret = nand_scan_ident(&info->mtd, pdata->mask_chipsel ? 2 : 1, NULL); |
695 | if (ret < 0) { | 695 | if (ret < 0) { |
696 | dev_dbg(&pdev->dev, "no NAND chip(s) found\n"); | 696 | dev_dbg(&pdev->dev, "no NAND chip(s) found\n"); |
697 | goto err_scan; | 697 | goto err_scan; |