Merge tag 'for-linus-20130509' of git://git.infradead.org/~dwmw2/random-2.6

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / drivers / mtd / nand / s3c2410.c

diff --git a/drivers/mtd/nand/s3c2410.c b/drivers/mtd/nand/s3c2410.c
index df954b4dcba238339892792d33bd48e5251cb1b0..d65afd23e171c16587dffd4fd0044121eb43313a 100644 (file)
--- a/drivers/mtd/nand/s3c2410.c
+++ b/drivers/mtd/nand/s3c2410.c
@@ -952,10 +952,9 @@ static int s3c24xx_nand_probe(struct platform_device *pdev)
        info->platform  = plat;
        info->cpu_type  = cpu_type;
 
-       info->regs      = devm_request_and_ioremap(&pdev->dev, res);
-       if (info->regs == NULL) {
-               dev_err(&pdev->dev, "cannot reserve register region\n");
-               err = -EIO;
+       info->regs = devm_ioremap_resource(&pdev->dev, res);
+       if (IS_ERR(info->regs)) {
+               err = PTR_ERR(info->regs);
                goto exit_error;
        }