diff options
Diffstat (limited to 'drivers/mtd/nand/mxc_nand.c')
-rw-r--r-- | drivers/mtd/nand/mxc_nand.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/mtd/nand/mxc_nand.c b/drivers/mtd/nand/mxc_nand.c index 45204e41a028..60ac5b98b718 100644 --- a/drivers/mtd/nand/mxc_nand.c +++ b/drivers/mtd/nand/mxc_nand.c | |||
@@ -1437,9 +1437,9 @@ static int mxcnd_probe(struct platform_device *pdev) | |||
1437 | res = platform_get_resource(pdev, IORESOURCE_MEM, 0); | 1437 | res = platform_get_resource(pdev, IORESOURCE_MEM, 0); |
1438 | if (!res) | 1438 | if (!res) |
1439 | return -ENODEV; | 1439 | return -ENODEV; |
1440 | host->regs_ip = devm_request_and_ioremap(&pdev->dev, res); | 1440 | host->regs_ip = devm_ioremap_resource(&pdev->dev, res); |
1441 | if (!host->regs_ip) | 1441 | if (IS_ERR(host->regs_ip)) |
1442 | return -ENOMEM; | 1442 | return PTR_ERR(host->regs_ip); |
1443 | 1443 | ||
1444 | res = platform_get_resource(pdev, IORESOURCE_MEM, 1); | 1444 | res = platform_get_resource(pdev, IORESOURCE_MEM, 1); |
1445 | } else { | 1445 | } else { |
@@ -1449,9 +1449,9 @@ static int mxcnd_probe(struct platform_device *pdev) | |||
1449 | if (!res) | 1449 | if (!res) |
1450 | return -ENODEV; | 1450 | return -ENODEV; |
1451 | 1451 | ||
1452 | host->base = devm_request_and_ioremap(&pdev->dev, res); | 1452 | host->base = devm_ioremap_resource(&pdev->dev, res); |
1453 | if (!host->base) | 1453 | if (IS_ERR(host->base)) |
1454 | return -ENOMEM; | 1454 | return PTR_ERR(host->base); |
1455 | 1455 | ||
1456 | host->main_area0 = host->base; | 1456 | host->main_area0 = host->base; |
1457 | 1457 | ||