summaryrefslogtreecommitdiffstats
path: root/drivers/gpio
diff options
context:
space:
mode:
authorWei Yongjun <weiyongjun1@huawei.com>2016-09-14 21:30:32 -0400
committerLinus Walleij <linus.walleij@linaro.org>2016-09-15 08:23:40 -0400
commit7f8b96570291def5104cec6f68bae09bd55b691a (patch)
tree62102f1ec1cdeef6881a5125c1b9865a5cc9339c /drivers/gpio
parentd47529b2e9fe0ec2eb1f072afad8849f52e385c4 (diff)
gpio: aspeed: fix return value check in aspeed_gpio_probe()
In case of error, the function devm_ioremap_resource() returns ERR_PTR() and never returns NULL. The NULL test in the return value check should be replaced with IS_ERR(). Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com> Acked-by: Joel Stanley <joel@jms.id.au> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/gpio')
-rw-r--r--drivers/gpio/gpio-aspeed.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpio/gpio-aspeed.c b/drivers/gpio/gpio-aspeed.c
index 9f7266e05f0a..8aa340677f65 100644
--- a/drivers/gpio/gpio-aspeed.c
+++ b/drivers/gpio/gpio-aspeed.c
@@ -413,8 +413,8 @@ static int __init aspeed_gpio_probe(struct platform_device *pdev)
413 return -ENXIO; 413 return -ENXIO;
414 414
415 gpio->base = devm_ioremap_resource(&pdev->dev, res); 415 gpio->base = devm_ioremap_resource(&pdev->dev, res);
416 if (!gpio->base) 416 if (IS_ERR(gpio->base))
417 return -ENOMEM; 417 return PTR_ERR(gpio->base);
418 418
419 spin_lock_init(&gpio->lock); 419 spin_lock_init(&gpio->lock);
420 420