| Message ID | 20220426124757.373587-1-yangyingliang@huawei.com (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [-next] net: cpsw: add missing of_node_put() in cpsw_probe_dt() | expand |
On Tue, 26 Apr 2022 20:47:57 +0800 Yang Yingliang wrote: > Subject: [PATCH -next] net: cpsw: add missing of_node_put() in cpsw_probe_dt() Why next? The commit under Fixes is in Linus's tree. Please sort this out and repost. > If devm_kcalloc() fails, 'tmp_node' should be put in cpsw_probe_dt(). > > Fixes: ed3525eda4c4 ("net: ethernet: ti: introduce cpsw switchdev based driver part 1 - dual-emac") > Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
On 2022/4/28 8:52, Jakub Kicinski wrote: > On Tue, 26 Apr 2022 20:47:57 +0800 Yang Yingliang wrote: >> Subject: [PATCH -next] net: cpsw: add missing of_node_put() in cpsw_probe_dt() > Why next? The commit under Fixes is in Linus's tree. > > Please sort this out and repost. It supposed to net, I write a wrong title, I will resend it. Thanks, Yang > >> If devm_kcalloc() fails, 'tmp_node' should be put in cpsw_probe_dt(). >> >> Fixes: ed3525eda4c4 ("net: ethernet: ti: introduce cpsw switchdev based driver part 1 - dual-emac") >> Signed-off-by: Yang Yingliang <yangyingliang@huawei.com> > .
diff --git a/drivers/net/ethernet/ti/cpsw_new.c b/drivers/net/ethernet/ti/cpsw_new.c index bd4b1528cf99..b81179f7d738 100644 --- a/drivers/net/ethernet/ti/cpsw_new.c +++ b/drivers/net/ethernet/ti/cpsw_new.c @@ -1246,8 +1246,10 @@ static int cpsw_probe_dt(struct cpsw_common *cpsw) data->slave_data = devm_kcalloc(dev, CPSW_SLAVE_PORTS_NUM, sizeof(struct cpsw_slave_data), GFP_KERNEL); - if (!data->slave_data) + if (!data->slave_data) { + of_node_put(tmp_node); return -ENOMEM; + } /* Populate all the child nodes here... */
If devm_kcalloc() fails, 'tmp_node' should be put in cpsw_probe_dt(). Fixes: ed3525eda4c4 ("net: ethernet: ti: introduce cpsw switchdev based driver part 1 - dual-emac") Signed-off-by: Yang Yingliang <yangyingliang@huawei.com> --- drivers/net/ethernet/ti/cpsw_new.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)