diff options
| author | Wei Yongjun <weiyongjun1@huawei.com> | 2017-04-25 11:29:30 +0000 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2017-04-28 09:40:52 +0200 |
| commit | c312c2c333b88145b3073cf5acd8362af3f0cc6e (patch) | |
| tree | ffda4a5cc7f3ab763eecef87531f95922963cf6d | |
| parent | a5bf5fc060b0095ebd6f1886da8ec482697176fa (diff) | |
| download | op-kernel-dev-c312c2c333b88145b3073cf5acd8362af3f0cc6e.zip op-kernel-dev-c312c2c333b88145b3073cf5acd8362af3f0cc6e.tar.gz | |
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>
| -rw-r--r-- | drivers/pinctrl/pinctrl-artpec6.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/pinctrl/pinctrl-artpec6.c b/drivers/pinctrl/pinctrl-artpec6.c index ffe33cf..357516d 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); |
