* [PATCH -next] pinctrl: mediatek: paris: fix return value check in mtk_paris_pinctrl_probe()
@ 2018-09-20 6:21 Wei Yongjun
2018-09-21 2:00 ` Sean Wang
2018-09-21 16:02 ` Linus Walleij
0 siblings, 2 replies; 3+ messages in thread
From: Wei Yongjun @ 2018-09-20 6:21 UTC (permalink / raw)
To: linux-arm-kernel
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>
---
drivers/pinctrl/mediatek/pinctrl-paris.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/pinctrl/mediatek/pinctrl-paris.c b/drivers/pinctrl/mediatek/pinctrl-paris.c
index 4cf0fea..d217902 100644
--- a/drivers/pinctrl/mediatek/pinctrl-paris.c
+++ b/drivers/pinctrl/mediatek/pinctrl-paris.c
@@ -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;
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH -next] pinctrl: mediatek: paris: fix return value check in mtk_paris_pinctrl_probe()
2018-09-20 6:21 [PATCH -next] pinctrl: mediatek: paris: fix return value check in mtk_paris_pinctrl_probe() Wei Yongjun
@ 2018-09-21 2:00 ` Sean Wang
2018-09-21 16:02 ` Linus Walleij
1 sibling, 0 replies; 3+ messages in thread
From: Sean Wang @ 2018-09-21 2:00 UTC (permalink / raw)
To: linux-arm-kernel
On Thu, 2018-09-20 at 06:21 +0000, Wei Yongjun wrote:
> 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>
> ---
> drivers/pinctrl/mediatek/pinctrl-paris.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/pinctrl/mediatek/pinctrl-paris.c b/drivers/pinctrl/mediatek/pinctrl-paris.c
> index 4cf0fea..d217902 100644
> --- a/drivers/pinctrl/mediatek/pinctrl-paris.c
> +++ b/drivers/pinctrl/mediatek/pinctrl-paris.c
> @@ -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;
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH -next] pinctrl: mediatek: paris: fix return value check in mtk_paris_pinctrl_probe()
2018-09-20 6:21 [PATCH -next] pinctrl: mediatek: paris: fix return value check in mtk_paris_pinctrl_probe() Wei Yongjun
2018-09-21 2:00 ` Sean Wang
@ 2018-09-21 16:02 ` Linus Walleij
1 sibling, 0 replies; 3+ messages in thread
From: Linus Walleij @ 2018-09-21 16:02 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, Sep 19, 2018 at 11:12 PM Wei Yongjun <weiyongjun1@huawei.com> wrote:
> 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>
Patch applied with Sean's ACK.
Yours,
Linus Walleij
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2018-09-21 16:02 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-09-20 6:21 [PATCH -next] pinctrl: mediatek: paris: fix return value check in mtk_paris_pinctrl_probe() Wei Yongjun
2018-09-21 2:00 ` Sean Wang
2018-09-21 16:02 ` Linus Walleij
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).