pinctrl: mediatek: moore: fix return value check in mtk_moore_pinctrl_probe()
Subsystems (5)
PATCH 1/1 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.
--- drivers/pinctrl/mediatek/pinctrl-moore.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/pinctrl/mediatek/pinctrl-moore.c +4 -4
@@ -608,8 +608,8 @@ int mtk_moore_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,
@@ -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 */ 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;
PATCH 1/1 pinctrl: mediatek: moore: fix return value check in mtk_moore_pinctrl_probe()
Quoted 6 lines · Wei Yongjun
In case of error, the function
devm_kmalloc_array()returns NULL pointer notERR_PTR(). TheIS_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 <[email protected]>
Quoted 31 lines
--- drivers/pinctrl/mediatek/pinctrl-moore.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)drivers/pinctrl/mediatek/pinctrl-moore.c +4
-4@@ -608,8 +608,8 @@ int mtk_moore_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,@@ -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 */ 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;
PATCH 1/1 pinctrl: mediatek: moore: fix return value check in mtk_moore_pinctrl_probe()
In reply to Wei YongjunQuoted 6 lines · Wei Yongjun
In case of error, the function
devm_kmalloc_array()returns NULL pointer notERR_PTR(). TheIS_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 <[email protected]>
Quoted 31 lines
--- drivers/pinctrl/mediatek/pinctrl-moore.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)drivers/pinctrl/mediatek/pinctrl-moore.c +4
-4@@ -608,8 +608,8 @@ int mtk_moore_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,@@ -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 */ 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;
Quoted 6 lines · Wei Yongjun
In case of error, the function
devm_kmalloc_array()returns NULL pointer notERR_PTR(). TheIS_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 <[email protected]>
Patch applied with Sean's ACK.
Yours,
Linus Walleij