aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWei Yongjun <yongjun_wei@trendmicro.com.cn>2016-07-06 08:17:41 -0400
committerLinus Walleij <linus.walleij@linaro.org>2016-07-11 03:50:06 -0400
commitaeb8753b6810df55559bcb8bdf88d88221f1521a (patch)
tree99104c03bb6a22191b49047b63dc81c90cb05e03
parent14672f43acf475fd3dff2b552c07f4d482ee6a20 (diff)
pinctrl: ns2: fix return value check in ns2_pinmux_probe()
In case of error, the function pinctrl_register() returns NULL 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> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
-rw-r--r--drivers/pinctrl/bcm/pinctrl-ns2-mux.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/pinctrl/bcm/pinctrl-ns2-mux.c b/drivers/pinctrl/bcm/pinctrl-ns2-mux.c
index 3fefd14acc3e..7e5f7b7bf4d5 100644
--- a/drivers/pinctrl/bcm/pinctrl-ns2-mux.c
+++ b/drivers/pinctrl/bcm/pinctrl-ns2-mux.c
@@ -1089,9 +1089,9 @@ static int ns2_pinmux_probe(struct platform_device *pdev)
1089 1089
1090 pinctrl->pctl = pinctrl_register(&ns2_pinctrl_desc, &pdev->dev, 1090 pinctrl->pctl = pinctrl_register(&ns2_pinctrl_desc, &pdev->dev,
1091 pinctrl); 1091 pinctrl);
1092 if (!pinctrl->pctl) { 1092 if (IS_ERR(pinctrl->pctl)) {
1093 dev_err(&pdev->dev, "unable to register IOMUX pinctrl\n"); 1093 dev_err(&pdev->dev, "unable to register IOMUX pinctrl\n");
1094 return -EINVAL; 1094 return PTR_ERR(pinctrl->pctl);
1095 } 1095 }
1096 1096
1097 return 0; 1097 return 0;