Merge tag 'for-linus-5.11-ofs1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-microblaze.git] / drivers / memory / jz4780-nemc.c

diff --git a/drivers/memory/jz4780-nemc.c b/drivers/memory/jz4780-nemc.c
index 3ec5cb0..555f7ac 100644 (file)
--- a/drivers/memory/jz4780-nemc.c
+++ b/drivers/memory/jz4780-nemc.c
@@ -291,6 +291,8 @@ static int jz4780_nemc_probe(struct platform_device *pdev)
        nemc->dev = dev;
 
        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+       if (!res)
+               return -EINVAL;
 
        /*
         * The driver currently only uses the registers up to offset
@@ -304,9 +306,9 @@ static int jz4780_nemc_probe(struct platform_device *pdev)
        }
 
        nemc->base = devm_ioremap(dev, res->start, NEMC_REG_LEN);
-       if (IS_ERR(nemc->base)) {
+       if (!nemc->base) {
                dev_err(dev, "failed to get I/O memory\n");
-               return PTR_ERR(nemc->base);
+               return -ENOMEM;
        }
 
        writel(0, nemc->base + NEMC_NFCSR);