summaryrefslogtreecommitdiff
path: root/drivers/memory/jz4780-nemc.c
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@oracle.com>2020-08-03 17:36:07 +0300
committerKrzysztof Kozlowski <krzk@kernel.org>2020-10-26 12:09:30 +0300
commit96999c797ec1ef41259f00b4ddf9cf33b342cb78 (patch)
tree969dcd5bec81ee0a37012d511eacdf99a28d7d6d /drivers/memory/jz4780-nemc.c
parent3650b228f83adda7e5ee532e2b90429c03f7b9ec (diff)
downloadlinux-96999c797ec1ef41259f00b4ddf9cf33b342cb78.tar.xz
memory: jz4780_nemc: Fix an error pointer vs NULL check in probe()
The devm_ioremap() function returns NULL on error, it doesn't return error pointers. This bug could lead to an Oops during probe. Fixes: f046e4a3f0b9 ("memory: jz4780_nemc: Only request IO memory the driver will use") Cc: <stable@vger.kernel.org> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Reviewed-by: Paul Cercueil <paul@crapouillou.net> Link: https://lore.kernel.org/r/20200803143607.GC346925@mwanda Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
Diffstat (limited to 'drivers/memory/jz4780-nemc.c')
-rw-r--r--drivers/memory/jz4780-nemc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/memory/jz4780-nemc.c b/drivers/memory/jz4780-nemc.c
index 3ec5cb0fce1e..608ae925e641 100644
--- a/drivers/memory/jz4780-nemc.c
+++ b/drivers/memory/jz4780-nemc.c
@@ -304,9 +304,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);