From: Wei Yongjun <weiyongjun1@huawei.com>
Date: Fri, 16 Sep 2016 01:50:01 +0000 (+0000)
Subject: hwrng: geode - fix return value check in mod_init()
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=104a32e85f250742bc37e14d19a5dec706bed76e;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

hwrng: geode - fix return value check in mod_init()

In case of error, the function devm_ioremap() returns NULL pointer
not ERR_PTR(). The IS_ERR() test in the return value check should
be replaced with NULL test.

Fixes: 6e9b5e76882c ("hwrng: geode - Migrate to managed API")
Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
---

diff --git a/drivers/char/hw_random/geode-rng.c b/drivers/char/hw_random/geode-rng.c
index 0cae21086c05..e7a245942029 100644
--- a/drivers/char/hw_random/geode-rng.c
+++ b/drivers/char/hw_random/geode-rng.c
@@ -95,8 +95,8 @@ static int __init mod_init(void)
 				return -ENODEV;
 
 			mem = devm_ioremap(&pdev->dev, rng_base, 0x58);
-			if (IS_ERR(mem))
-				return PTR_ERR(mem);
+			if (!mem)
+				return -ENOMEM;
 			geode_rng.priv = (unsigned long)mem;
 
 			pr_info("AMD Geode RNG detected\n");