pinctrl: mediatek: paris: fix return value check in mtk_paris_pinctrl_probe() (184744e9) · Commits · 戴 / test

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: ("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

+4 −4

Original line number	Diff line number	Diff line
		@@ -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;

Admin message