From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Date: Sat, 6 Feb 2016 14:56:36 +0000 (+0800)
Subject: pinctrl: Fix return value check in amd_gpio_probe()
X-Git-Tag: Ubuntu-5.4-5.4.0-11.14~10588^2~37
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=424a6c607c169ca0ac8431424f28fc839b45b14c;p=mirror_ubuntu-focal-kernel.git

pinctrl: Fix return value check in amd_gpio_probe()

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

Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
---

diff --git a/drivers/pinctrl/pinctrl-amd.c b/drivers/pinctrl/pinctrl-amd.c
index 657449431301..5c025f5b5048 100644
--- a/drivers/pinctrl/pinctrl-amd.c
+++ b/drivers/pinctrl/pinctrl-amd.c
@@ -753,8 +753,8 @@ static int amd_gpio_probe(struct platform_device *pdev)
 
 	gpio_dev->base = devm_ioremap_nocache(&pdev->dev, res->start,
 						resource_size(res));
-	if (IS_ERR(gpio_dev->base))
-		return PTR_ERR(gpio_dev->base);
+	if (!gpio_dev->base)
+		return -ENOMEM;
 
 	irq_base = platform_get_irq(pdev, 0);
 	if (irq_base < 0) {