diff options
| author | Wei Yongjun <yongjun_wei@trendmicro.com.cn> | 2014-09-12 01:12:14 +0200 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2014-09-24 10:04:28 +0200 |
| commit | 4f51b91335a63b2672a0f21fd13a684c8e35c4e8 (patch) | |
| tree | 59f808456d03bc48d484022aa0df61380d4a45bc /drivers/gpio | |
| parent | GPIO: gpiolib: trivial: Add missing carriage return (diff) | |
| download | linux-4f51b91335a63b2672a0f21fd13a684c8e35c4e8.tar.xz linux-4f51b91335a63b2672a0f21fd13a684c8e35c4e8.zip | |
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.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpio/gpio-xgene.c b/drivers/gpio/gpio-xgene.c index f1944d496c3b..150e7f1c5ae8 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; } |