From: Wojciech Drewek <wojciech.drewek@intel.com>
To: Jan Kiszka <jan.kiszka@siemens.com>,
"David S. Miller" <davem@davemloft.net>,
Eric Dumazet <edumazet@google.com>,
Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>,
MD Danish Anwar <danishanwar@ti.com>
Cc: <netdev@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
"Lopes Ivo, Diogo Miguel (T CED IFD-PT)" <diogo.ivo@siemens.com>,
Nishanth Menon <nm@ti.com>,
"Su, Bao Cheng (RC-CN DF FA R&D)" <baocheng.su@siemens.com>
Subject: Re: [PATCH net v3] net: ti: icssg-prueth: Add missing icss_iep_put to error path
Date: Mon, 6 Nov 2023 13:01:53 +0100 [thread overview]
Message-ID: <2a5434e8-ece3-422b-99bf-d3f56750d408@intel.com> (raw)
In-Reply-To: <b2857e2c-cacf-4077-8e15-308dce8ccb0b@siemens.com>
On 06.11.2023 12:47, Jan Kiszka wrote:
> From: Jan Kiszka <jan.kiszka@siemens.com>
>
> Analogously to prueth_remove, just also taking care for NULL'ing the
> iep pointers.
>
> Fixes: 186734c15886 ("net: ti: icssg-prueth: add packet timestamping and ptp support")
> Fixes: 443a2367ba3c ("net: ti: icssg-prueth: am65x SR2.0 add 10M full duplex support")
> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
> ---
Thanks!
Reviewed-by: Wojciech Drewek <wojciech.drewek@intel.com>
>
> Changes in v3:
> - consolidate cleanup logic further [Wojciech]
> - make sure to NULL iep pointers
>
> Changes in v2:
> - add proper tags
>
> This was lost from the TI SDK version while ripping out SR1.0 support - which we are currently restoring for upstream.
>
> drivers/net/ethernet/ti/icssg/icssg_prueth.c | 11 +++++++----
> 1 file changed, 7 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/net/ethernet/ti/icssg/icssg_prueth.c b/drivers/net/ethernet/ti/icssg/icssg_prueth.c
> index 6c4b64227ac8..3abbeba26f1b 100644
> --- a/drivers/net/ethernet/ti/icssg/icssg_prueth.c
> +++ b/drivers/net/ethernet/ti/icssg/icssg_prueth.c
> @@ -2105,10 +2105,7 @@ static int prueth_probe(struct platform_device *pdev)
> prueth->iep1 = icss_iep_get_idx(np, 1);
> if (IS_ERR(prueth->iep1)) {
> ret = dev_err_probe(dev, PTR_ERR(prueth->iep1), "iep1 get failed\n");
> - icss_iep_put(prueth->iep0);
> - prueth->iep0 = NULL;
> - prueth->iep1 = NULL;
> - goto free_pool;
> + goto put_iep0;
> }
>
> if (prueth->pdata.quirk_10m_link_issue) {
> @@ -2205,6 +2202,12 @@ static int prueth_probe(struct platform_device *pdev)
> exit_iep:
> if (prueth->pdata.quirk_10m_link_issue)
> icss_iep_exit_fw(prueth->iep1);
> + icss_iep_put(prueth->iep1);
> +
> +put_iep0:
> + icss_iep_put(prueth->iep0);
> + prueth->iep0 = NULL;
> + prueth->iep1 = NULL;
>
> free_pool:
> gen_pool_free(prueth->sram_pool,
next prev parent reply other threads:[~2023-11-06 12:02 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-06 11:47 [PATCH net v3] net: ti: icssg-prueth: Add missing icss_iep_put to error path Jan Kiszka
2023-11-06 12:01 ` Wojciech Drewek [this message]
2023-11-08 2:32 ` Jakub Kicinski
2023-11-09 11:08 ` Jan Kiszka
2023-11-09 15:29 ` Jakub Kicinski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=2a5434e8-ece3-422b-99bf-d3f56750d408@intel.com \
--to=wojciech.drewek@intel.com \
--cc=baocheng.su@siemens.com \
--cc=danishanwar@ti.com \
--cc=davem@davemloft.net \
--cc=diogo.ivo@siemens.com \
--cc=edumazet@google.com \
--cc=jan.kiszka@siemens.com \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=nm@ti.com \
--cc=pabeni@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).