Merge branch 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel...

[karo-tx-linux.git] / drivers / mtd / nand / s3c2410.c

diff --git a/drivers/mtd/nand/s3c2410.c b/drivers/mtd/nand/s3c2410.c
index 79ded48e7427f7b868a9b419385db2263f279474..d65afd23e171c16587dffd4fd0044121eb43313a 100644 (file)
--- a/drivers/mtd/nand/s3c2410.c
+++ b/drivers/mtd/nand/s3c2410.c
@@ -730,11 +730,14 @@ static int s3c2410_nand_add_partition(struct s3c2410_nand_info *info,
                                      struct s3c2410_nand_mtd *mtd,
                                      struct s3c2410_nand_set *set)
 {
-       if (set)
+       if (set) {
                mtd->mtd.name = set->name;
 
-       return mtd_device_parse_register(&mtd->mtd, NULL, NULL,
+               return mtd_device_parse_register(&mtd->mtd, NULL, NULL,
                                         set->partitions, set->nr_partitions);
+       }
+
+       return -ENODEV;
 }
 
 /**
@@ -949,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;
        }