diff options
author | Wei Yongjun <weiyongjun1@huawei.com> | 2018-09-20 02:21:50 -0400 |
---|---|---|
committer | Linus Walleij <linus.walleij@linaro.org> | 2018-09-21 12:08:18 -0400 |
commit | 068cfb9a0fd908747f29d048719f254e21b9dad5 (patch) | |
tree | 9d430330221d4440414b7589807d3ca58c7ca069 /drivers/pinctrl/mediatek | |
parent | 07c6b037c2bae2a0f1978198f1486b3b2681261b (diff) |
pinctrl: mediatek: moore: fix return value check in mtk_moore_pinctrl_probe()
In case of error, the function devm_kmalloc_array() returns NULL pointer
not ERR_PTR(). The IS_ERR() test in the return value check should be
replaced with NULL test.
Fixes: b7d7f9eeca55 ("pinctrl: mediatek: extend struct mtk_pin_desc which per-pin driver depends on")
Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
Acked-by: Sean Wang <sean.wang@mediatek.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/pinctrl/mediatek')
-rw-r--r-- | drivers/pinctrl/mediatek/pinctrl-moore.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/pinctrl/mediatek/pinctrl-moore.c b/drivers/pinctrl/mediatek/pinctrl-moore.c index c27597cd3931..3bf5dd552749 100644 --- a/drivers/pinctrl/mediatek/pinctrl-moore.c +++ b/drivers/pinctrl/mediatek/pinctrl-moore.c | |||
@@ -608,8 +608,8 @@ int mtk_moore_pinctrl_probe(struct platform_device *pdev, | |||
608 | 608 | ||
609 | hw->base = devm_kmalloc_array(&pdev->dev, hw->soc->nbase_names, | 609 | hw->base = devm_kmalloc_array(&pdev->dev, hw->soc->nbase_names, |
610 | sizeof(*hw->base), GFP_KERNEL); | 610 | sizeof(*hw->base), GFP_KERNEL); |
611 | if (IS_ERR(hw->base)) | 611 | if (!hw->base) |
612 | return PTR_ERR(hw->base); | 612 | return -ENOMEM; |
613 | 613 | ||
614 | for (i = 0; i < hw->soc->nbase_names; i++) { | 614 | for (i = 0; i < hw->soc->nbase_names; i++) { |
615 | res = platform_get_resource_byname(pdev, IORESOURCE_MEM, | 615 | res = platform_get_resource_byname(pdev, IORESOURCE_MEM, |
@@ -629,8 +629,8 @@ int mtk_moore_pinctrl_probe(struct platform_device *pdev, | |||
629 | /* Copy from internal struct mtk_pin_desc to register to the core */ | 629 | /* Copy from internal struct mtk_pin_desc to register to the core */ |
630 | pins = devm_kmalloc_array(&pdev->dev, hw->soc->npins, sizeof(*pins), | 630 | pins = devm_kmalloc_array(&pdev->dev, hw->soc->npins, sizeof(*pins), |
631 | GFP_KERNEL); | 631 | GFP_KERNEL); |
632 | if (IS_ERR(pins)) | 632 | if (!pins) |
633 | return PTR_ERR(pins); | 633 | return -ENOMEM; |
634 | 634 | ||
635 | for (i = 0; i < hw->soc->npins; i++) { | 635 | for (i = 0; i < hw->soc->npins; i++) { |
636 | pins[i].number = hw->soc->pins[i].number; | 636 | pins[i].number = hw->soc->pins[i].number; |