diff options
| author |   Wei Yongjun <yongjun_wei@trendmicro.com.cn> | 2013-03-11 22:08:12 +0800 |
|---|---|---|
| committer |   Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> | 2013-03-15 13:33:52 +0100 |
| commit | fd9d05b0fdb0a8a2bbe2451b9e520547813d0562 (patch) | |
| tree | 08dcacb426c4f23e275fa2889cf445cfda2156f3 /drivers/pinctrl/sh-pfc/pinctrl.c | |
| parent | sh: shx3: Add pin control resources (diff) | |
| download | linux-dev-fd9d05b0fdb0a8a2bbe2451b9e520547813d0562.tar.xz linux-dev-fd9d05b0fdb0a8a2bbe2451b9e520547813d0562.zip | |
sh-pfc: Fix return value check in sh_pfc_register_pinctrl()
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: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/pinctrl/sh-pfc/pinctrl.c')
| -rw-r--r-- | drivers/pinctrl/sh-pfc/pinctrl.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/pinctrl/sh-pfc/pinctrl.c b/drivers/pinctrl/sh-pfc/pinctrl.c index c7f3c406f9de..3e49bf0eac25 100644 --- a/drivers/pinctrl/sh-pfc/pinctrl.c +++ b/drivers/pinctrl/sh-pfc/pinctrl.c @@ -395,8 +395,8 @@ int sh_pfc_register_pinctrl(struct sh_pfc *pfc) pmx->pctl_desc.npins = pfc->info->nr_pins; pmx->pctl = pinctrl_register(&pmx->pctl_desc, pfc->dev, pmx); - if (IS_ERR(pmx->pctl)) - return PTR_ERR(pmx->pctl); + if (pmx->pctl == NULL) + return -EINVAL; return 0; } |