pinctrl: mediatek: paris: fix return value check in mtk_paris_pinctrl_probe()
authorWei Yongjun <weiyongjun1@huawei.com>
Thu, 20 Sep 2018 06:21:28 +0000 (06:21 +0000)
committerLinus Walleij <linus.walleij@linaro.org>
Fri, 21 Sep 2018 16:00:51 +0000 (09:00 -0700)
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: 805250982bb5 ("pinctrl: mediatek: add pinctrl-paris that implements the vendor dt-bindings")
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>
drivers/pinctrl/mediatek/pinctrl-paris.c

index 4cf0fea30b7debdc9c5cd57ecd1384354f354126..d2179028f1347e4044db20fa80bf06d8dd2b5eca 100644 (file)
@@ -836,8 +836,8 @@ int mtk_paris_pinctrl_probe(struct platform_device *pdev,
 
        hw->base = devm_kmalloc_array(&pdev->dev, hw->soc->nbase_names,
                                      sizeof(*hw->base), GFP_KERNEL);
-       if (IS_ERR(hw->base))
-               return PTR_ERR(hw->base);
+       if (!hw->base)
+               return -ENOMEM;
 
        for (i = 0; i < hw->soc->nbase_names; i++) {
                res = platform_get_resource_byname(pdev, IORESOURCE_MEM,
@@ -863,8 +863,8 @@ int mtk_paris_pinctrl_probe(struct platform_device *pdev,
        /* Copy from internal struct mtk_pin_desc to register to the core */
        pins = devm_kmalloc_array(&pdev->dev, hw->soc->npins, sizeof(*pins),
                                  GFP_KERNEL);
-       if (IS_ERR(pins))
-               return PTR_ERR(pins);
+       if (!pins)
+               return -ENOMEM;
 
        for (i = 0; i < hw->soc->npins; i++) {
                pins[i].number = hw->soc->pins[i].number;