Message ID | bbc536dd-f64e-4ccf-89df-3afbe02b59ca@siemens.com (mailing list archive) |
---|---|
State | Accepted |
Commit | 2bd5b559a1f391f05927bbb0b31381fa71c61e26 |
Delegated to: | Netdev Maintainers |
Headers | show |
Series | [net,v3] net: ti: icssg-prueth: Fix error cleanup on failing pruss_request_mem_region | expand |
On 10/11/2023 18:13, Jan Kiszka wrote: > From: Jan Kiszka <jan.kiszka@siemens.com> > > We were just continuing in this case, surely not desired. > > Fixes: 128d5874c082 ("net: ti: icssg-prueth: Add ICSSG ethernet driver") > Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com> > Reviewed-by: Wojciech Drewek <wojciech.drewek@intel.com> Reviewed-by: Roger Quadros <rogerq@kernel.org>
Hello: This patch was applied to netdev/net.git (main) by David S. Miller <davem@davemloft.net>: On Fri, 10 Nov 2023 17:13:08 +0100 you wrote: > From: Jan Kiszka <jan.kiszka@siemens.com> > > We were just continuing in this case, surely not desired. > > Fixes: 128d5874c082 ("net: ti: icssg-prueth: Add ICSSG ethernet driver") > Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com> > Reviewed-by: Wojciech Drewek <wojciech.drewek@intel.com> > > [...] Here is the summary with links: - [net,v3] net: ti: icssg-prueth: Fix error cleanup on failing pruss_request_mem_region https://git.kernel.org/netdev/net/c/2bd5b559a1f3 You are awesome, thank you!
diff --git a/drivers/net/ethernet/ti/icssg/icssg_prueth.c b/drivers/net/ethernet/ti/icssg/icssg_prueth.c index 3abbeba26f1b..411898a4f38c 100644 --- a/drivers/net/ethernet/ti/icssg/icssg_prueth.c +++ b/drivers/net/ethernet/ti/icssg/icssg_prueth.c @@ -2063,7 +2063,7 @@ static int prueth_probe(struct platform_device *pdev) &prueth->shram); if (ret) { dev_err(dev, "unable to get PRUSS SHRD RAM2: %d\n", ret); - pruss_put(prueth->pruss); + goto put_pruss; } prueth->sram_pool = of_gen_pool_get(np, "sram", 0); @@ -2215,6 +2215,8 @@ static int prueth_probe(struct platform_device *pdev) put_mem: pruss_release_mem_region(prueth->pruss, &prueth->shram); + +put_pruss: pruss_put(prueth->pruss); put_cores: