summaryrefslogtreecommitdiffstats
path: root/drivers/gpio
diff options
context:
space:
mode:
authorWei Yongjun <yongjun_wei@trendmicro.com.cn>2014-09-12 07:12:14 +0800
committerLinus Walleij <linus.walleij@linaro.org>2014-09-24 10:04:28 +0200
commit4f51b91335a63b2672a0f21fd13a684c8e35c4e8 (patch)
tree59f808456d03bc48d484022aa0df61380d4a45bc /drivers/gpio
parent43a8785aeedc3eb1ffce95d46a8e7ca3e0d591d8 (diff)
downloadop-kernel-dev-4f51b91335a63b2672a0f21fd13a684c8e35c4e8.zip
op-kernel-dev-4f51b91335a63b2672a0f21fd13a684c8e35c4e8.tar.gz
gpio: Fix return value check in xgene_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> Reviewed-by: Alexandre Courbot <acourbot@nvidia.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/gpio')
-rw-r--r--drivers/gpio/gpio-xgene.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpio/gpio-xgene.c b/drivers/gpio/gpio-xgene.c
index f1944d4..150e7f1 100644
--- a/drivers/gpio/gpio-xgene.c
+++ b/drivers/gpio/gpio-xgene.c
@@ -182,8 +182,8 @@ static int xgene_gpio_probe(struct platform_device *pdev)
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
gpio->base = devm_ioremap_nocache(&pdev->dev, res->start,
resource_size(res));
- if (IS_ERR(gpio->base)) {
- err = PTR_ERR(gpio->base);
+ if (!gpio->base) {
+ err = -ENOMEM;
goto err;
}
OpenPOWER on IntegriCloud