summaryrefslogtreecommitdiffstats
path: root/drivers/pinctrl
diff options
context:
space:
mode:
authorWei Yongjun <weiyongjun1@huawei.com>2017-04-25 13:29:30 +0200
committerLinus Walleij <linus.walleij@linaro.org>2017-04-28 09:40:52 +0200
commitc312c2c333b88145b3073cf5acd8362af3f0cc6e (patch)
treeffda4a5cc7f3ab763eecef87531f95922963cf6d /drivers/pinctrl
parentpinctrl: artpec6: Remove .owner field for driver (diff)
downloadlinux-c312c2c333b88145b3073cf5acd8362af3f0cc6e.tar.xz
linux-c312c2c333b88145b3073cf5acd8362af3f0cc6e.zip
pinctrl: artpec6: Fix return value check in artpec6_pmx_probe()
In case of error, the function pinctrl_register() returns ERR_PTR() not 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: Jesper Nilsson <jesper.nilsson@axis.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/pinctrl')
-rw-r--r--drivers/pinctrl/pinctrl-artpec6.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/pinctrl/pinctrl-artpec6.c b/drivers/pinctrl/pinctrl-artpec6.c
index ffe33cfde5b2..357516d524bd 100644
--- a/drivers/pinctrl/pinctrl-artpec6.c
+++ b/drivers/pinctrl/pinctrl-artpec6.c
@@ -937,9 +937,9 @@ static int artpec6_pmx_probe(struct platform_device *pdev)
pmx->num_pin_groups = ARRAY_SIZE(artpec6_pin_groups);
pmx->pctl = pinctrl_register(&artpec6_desc, &pdev->dev, pmx);
- if (!pmx->pctl) {
+ if (IS_ERR(pmx->pctl)) {
dev_err(&pdev->dev, "could not register pinctrl driver\n");
- return -EINVAL;
+ return PTR_ERR(pmx->pctl);
}
platform_set_drvdata(pdev, pmx);