Commit 068cfb9a authored by Wei Yongjun's avatar Wei Yongjun Committed by Linus Walleij

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: b7d7f9ee ("pinctrl: mediatek: extend struct mtk_pin_desc which per-pin driver depends on")
Signed-off-by: default avatarWei Yongjun <weiyongjun1@huawei.com>
Acked-by: default avatarSean Wang <sean.wang@mediatek.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 07c6b037
...@@ -608,8 +608,8 @@ int mtk_moore_pinctrl_probe(struct platform_device *pdev, ...@@ -608,8 +608,8 @@ int mtk_moore_pinctrl_probe(struct platform_device *pdev,
hw->base = devm_kmalloc_array(&pdev->dev, hw->soc->nbase_names, hw->base = devm_kmalloc_array(&pdev->dev, hw->soc->nbase_names,
sizeof(*hw->base), GFP_KERNEL); sizeof(*hw->base), GFP_KERNEL);
if (IS_ERR(hw->base)) if (!hw->base)
return PTR_ERR(hw->base); return -ENOMEM;
for (i = 0; i < hw->soc->nbase_names; i++) { for (i = 0; i < hw->soc->nbase_names; i++) {
res = platform_get_resource_byname(pdev, IORESOURCE_MEM, res = platform_get_resource_byname(pdev, IORESOURCE_MEM,
...@@ -629,8 +629,8 @@ int mtk_moore_pinctrl_probe(struct platform_device *pdev, ...@@ -629,8 +629,8 @@ int mtk_moore_pinctrl_probe(struct platform_device *pdev,
/* Copy from internal struct mtk_pin_desc to register to the core */ /* Copy from internal struct mtk_pin_desc to register to the core */
pins = devm_kmalloc_array(&pdev->dev, hw->soc->npins, sizeof(*pins), pins = devm_kmalloc_array(&pdev->dev, hw->soc->npins, sizeof(*pins),
GFP_KERNEL); GFP_KERNEL);
if (IS_ERR(pins)) if (!pins)
return PTR_ERR(pins); return -ENOMEM;
for (i = 0; i < hw->soc->npins; i++) { for (i = 0; i < hw->soc->npins; i++) {
pins[i].number = hw->soc->pins[i].number; pins[i].number = hw->soc->pins[i].number;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment