* [PATCH] net: ethernet: mtk_wed: Fix missing of_node_put() in mtk_wed_wo_hardware_init()
@ 2022-12-05 1:58 Yuan Can
2022-12-05 3:42 ` Yuan Can
0 siblings, 1 reply; 4+ messages in thread
From: Yuan Can @ 2022-12-05 1:58 UTC (permalink / raw)
To: nbd, john, sean.wang, Mark-MC.Lee, lorenzo, davem, edumazet,
kuba, pabeni, matthias.bgg, sujuan.chen, leon, netdev,
linux-arm-kernel, linux-mediatek
Cc: yuancan
The np needs to be released through of_node_put() in the error handling
path of mtk_wed_wo_hardware_init().
Fixes: 799684448e3e ("net: ethernet: mtk_wed: introduce wed wo support")
Signed-off-by: Yuan Can <yuancan@huawei.com>
---
drivers/net/ethernet/mediatek/mtk_wed_wo.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/drivers/net/ethernet/mediatek/mtk_wed_wo.c b/drivers/net/ethernet/mediatek/mtk_wed_wo.c
index 4754b6db009e..fcc4b3206d2d 100644
--- a/drivers/net/ethernet/mediatek/mtk_wed_wo.c
+++ b/drivers/net/ethernet/mediatek/mtk_wed_wo.c
@@ -407,8 +407,10 @@ mtk_wed_wo_hardware_init(struct mtk_wed_wo *wo)
return -ENODEV;
wo->mmio.regs = syscon_regmap_lookup_by_phandle(np, NULL);
- if (IS_ERR_OR_NULL(wo->mmio.regs))
- return PTR_ERR(wo->mmio.regs);
+ if (IS_ERR(wo->mmio.regs)) {
+ ret = PTR_ERR(wo->mmio.regs);
+ goto error_put;
+ }
wo->mmio.irq = irq_of_parse_and_map(np, 0);
wo->mmio.irq_mask = MTK_WED_WO_ALL_INT_MASK;
@@ -456,7 +458,8 @@ mtk_wed_wo_hardware_init(struct mtk_wed_wo *wo)
error:
devm_free_irq(wo->hw->dev, wo->mmio.irq, wo);
-
+error_put:
+ of_node_put(np);
return ret;
}
--
2.17.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] net: ethernet: mtk_wed: Fix missing of_node_put() in mtk_wed_wo_hardware_init()
2022-12-05 1:58 [PATCH] net: ethernet: mtk_wed: Fix missing of_node_put() in mtk_wed_wo_hardware_init() Yuan Can
@ 2022-12-05 3:42 ` Yuan Can
0 siblings, 0 replies; 4+ messages in thread
From: Yuan Can @ 2022-12-05 3:42 UTC (permalink / raw)
To: nbd, john, sean.wang, Mark-MC.Lee, lorenzo, davem, edumazet,
kuba, pabeni, matthias.bgg, sujuan.chen, leon, netdev,
linux-arm-kernel, linux-mediatek
Please ignore this mail, sorry about the noise.
在 2022/12/5 9:58, Yuan Can 写道:
> The np needs to be released through of_node_put() in the error handling
> path of mtk_wed_wo_hardware_init().
>
> Fixes: 799684448e3e ("net: ethernet: mtk_wed: introduce wed wo support")
> Signed-off-by: Yuan Can <yuancan@huawei.com>
> ---
> drivers/net/ethernet/mediatek/mtk_wed_wo.c | 9 ++++++---
> 1 file changed, 6 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/net/ethernet/mediatek/mtk_wed_wo.c b/drivers/net/ethernet/mediatek/mtk_wed_wo.c
> index 4754b6db009e..fcc4b3206d2d 100644
> --- a/drivers/net/ethernet/mediatek/mtk_wed_wo.c
> +++ b/drivers/net/ethernet/mediatek/mtk_wed_wo.c
> @@ -407,8 +407,10 @@ mtk_wed_wo_hardware_init(struct mtk_wed_wo *wo)
> return -ENODEV;
>
> wo->mmio.regs = syscon_regmap_lookup_by_phandle(np, NULL);
> - if (IS_ERR_OR_NULL(wo->mmio.regs))
> - return PTR_ERR(wo->mmio.regs);
> + if (IS_ERR(wo->mmio.regs)) {
> + ret = PTR_ERR(wo->mmio.regs);
> + goto error_put;
> + }
>
> wo->mmio.irq = irq_of_parse_and_map(np, 0);
> wo->mmio.irq_mask = MTK_WED_WO_ALL_INT_MASK;
> @@ -456,7 +458,8 @@ mtk_wed_wo_hardware_init(struct mtk_wed_wo *wo)
>
> error:
> devm_free_irq(wo->hw->dev, wo->mmio.irq, wo);
> -
> +error_put:
> + of_node_put(np);
> return ret;
> }
>
--
Best regards,
Yuan Can
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] net: ethernet: mtk_wed: Fix missing of_node_put() in mtk_wed_wo_hardware_init()
2022-12-02 8:30 Yuan Can
@ 2022-12-04 12:32 ` Leon Romanovsky
0 siblings, 0 replies; 4+ messages in thread
From: Leon Romanovsky @ 2022-12-04 12:32 UTC (permalink / raw)
To: Yuan Can
Cc: nbd, john, sean.wang, Mark-MC.Lee, lorenzo, davem, edumazet,
kuba, pabeni, matthias.bgg, sujuan.chen, netdev,
linux-arm-kernel, linux-mediatek
On Fri, Dec 02, 2022 at 08:30:29AM +0000, Yuan Can wrote:
> The np needs to be released through of_node_put() in the error handling
> path of mtk_wed_wo_hardware_init().
>
> Fixes: 799684448e3e ("net: ethernet: mtk_wed: introduce wed wo support")
> Signed-off-by: Yuan Can <yuancan@huawei.com>
> ---
> drivers/net/ethernet/mediatek/mtk_wed_wo.c | 9 ++++++---
> 1 file changed, 6 insertions(+), 3 deletions(-)
Please use [PATCH net-next] ... format in title.
>
> diff --git a/drivers/net/ethernet/mediatek/mtk_wed_wo.c b/drivers/net/ethernet/mediatek/mtk_wed_wo.c
> index 4754b6db009e..d61bd0b11331 100644
> --- a/drivers/net/ethernet/mediatek/mtk_wed_wo.c
> +++ b/drivers/net/ethernet/mediatek/mtk_wed_wo.c
> @@ -407,8 +407,10 @@ mtk_wed_wo_hardware_init(struct mtk_wed_wo *wo)
> return -ENODEV;
>
> wo->mmio.regs = syscon_regmap_lookup_by_phandle(np, NULL);
> - if (IS_ERR_OR_NULL(wo->mmio.regs))
syscon_regmap_lookup_by_phandle() returns or error or valid pointer.
The right check needs to be IS_ERR(wo->mmio.regs)
Thanks
> - return PTR_ERR(wo->mmio.regs);
> + if (IS_ERR_OR_NULL(wo->mmio.regs)) {
> + ret = PTR_ERR(wo->mmio.regs);
> + goto error_put;
> + }
>
> wo->mmio.irq = irq_of_parse_and_map(np, 0);
> wo->mmio.irq_mask = MTK_WED_WO_ALL_INT_MASK;
> @@ -456,7 +458,8 @@ mtk_wed_wo_hardware_init(struct mtk_wed_wo *wo)
>
> error:
> devm_free_irq(wo->hw->dev, wo->mmio.irq, wo);
> -
> +error_put:
> + of_node_put(np);
> return ret;
> }
>
> --
> 2.17.1
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH] net: ethernet: mtk_wed: Fix missing of_node_put() in mtk_wed_wo_hardware_init()
@ 2022-12-02 8:30 Yuan Can
2022-12-04 12:32 ` Leon Romanovsky
0 siblings, 1 reply; 4+ messages in thread
From: Yuan Can @ 2022-12-02 8:30 UTC (permalink / raw)
To: nbd, john, sean.wang, Mark-MC.Lee, lorenzo, davem, edumazet,
kuba, pabeni, matthias.bgg, sujuan.chen, netdev,
linux-arm-kernel, linux-mediatek
Cc: yuancan
The np needs to be released through of_node_put() in the error handling
path of mtk_wed_wo_hardware_init().
Fixes: 799684448e3e ("net: ethernet: mtk_wed: introduce wed wo support")
Signed-off-by: Yuan Can <yuancan@huawei.com>
---
drivers/net/ethernet/mediatek/mtk_wed_wo.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/drivers/net/ethernet/mediatek/mtk_wed_wo.c b/drivers/net/ethernet/mediatek/mtk_wed_wo.c
index 4754b6db009e..d61bd0b11331 100644
--- a/drivers/net/ethernet/mediatek/mtk_wed_wo.c
+++ b/drivers/net/ethernet/mediatek/mtk_wed_wo.c
@@ -407,8 +407,10 @@ mtk_wed_wo_hardware_init(struct mtk_wed_wo *wo)
return -ENODEV;
wo->mmio.regs = syscon_regmap_lookup_by_phandle(np, NULL);
- if (IS_ERR_OR_NULL(wo->mmio.regs))
- return PTR_ERR(wo->mmio.regs);
+ if (IS_ERR_OR_NULL(wo->mmio.regs)) {
+ ret = PTR_ERR(wo->mmio.regs);
+ goto error_put;
+ }
wo->mmio.irq = irq_of_parse_and_map(np, 0);
wo->mmio.irq_mask = MTK_WED_WO_ALL_INT_MASK;
@@ -456,7 +458,8 @@ mtk_wed_wo_hardware_init(struct mtk_wed_wo *wo)
error:
devm_free_irq(wo->hw->dev, wo->mmio.irq, wo);
-
+error_put:
+ of_node_put(np);
return ret;
}
--
2.17.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-12-05 3:42 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-12-05 1:58 [PATCH] net: ethernet: mtk_wed: Fix missing of_node_put() in mtk_wed_wo_hardware_init() Yuan Can
2022-12-05 3:42 ` Yuan Can
-- strict thread matches above, loose matches on Subject: below --
2022-12-02 8:30 Yuan Can
2022-12-04 12:32 ` Leon Romanovsky
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).