X-Git-Url: https://git.stricted.de/?a=blobdiff_plain;f=drivers%2Fmtd%2Fnand%2Fs3c2410.c;h=d65afd23e171c16587dffd4fd0044121eb43313a;hb=f741df1f3a2afe988f413ca78d1e866657079beb;hp=df954b4dcba238339892792d33bd48e5251cb1b0;hpb=c157750a901d767ecb95f1dbabd0972dee396b1e;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git

diff --git a/drivers/mtd/nand/s3c2410.c b/drivers/mtd/nand/s3c2410.c
index df954b4dcba2..d65afd23e171 100644
--- 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;
 	}