mtd: nand: Allow caller to pass alternative ID table to nand_scan_ident()

[deliverable/linux.git] / drivers / mtd / nand / sh_flctl.c

diff --git a/drivers/mtd/nand/sh_flctl.c b/drivers/mtd/nand/sh_flctl.c
index 02bef21f2e4b987099a8f1f8d856c7364cbf9a58..dbc09a81866e078c41c2d0d07a07986718aafe2b 100644 (file)
--- a/drivers/mtd/nand/sh_flctl.c
+++ b/drivers/mtd/nand/sh_flctl.c
@@ -797,7 +797,7 @@ static int __init flctl_probe(struct platform_device *pdev)
                goto err;
        }
 
-       flctl->reg = ioremap(res->start, res->end - res->start + 1);
+       flctl->reg = ioremap(res->start, resource_size(res));
        if (flctl->reg == NULL) {
                printk(KERN_ERR "%s: ioremap error.\n", __func__);
                ret = -ENOMEM;
@@ -825,7 +825,7 @@ static int __init flctl_probe(struct platform_device *pdev)
        nand->select_chip = flctl_select_chip;
        nand->cmdfunc = flctl_cmdfunc;
 
-       ret = nand_scan_ident(flctl_mtd, 1);
+       ret = nand_scan_ident(flctl_mtd, 1, NULL);
        if (ret)
                goto err;