Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) client-ip=2620:137:e000::3:5;
Message-ID: <b2857e2c-cacf-4077-8e15-308dce8ccb0b@siemens.com>
Date:   Mon, 6 Nov 2023 12:47:42 +0100
User-Agent: Mozilla Thunderbird
From:   Jan Kiszka <jan.kiszka@siemens.com>
Subject: [PATCH net v3] net: ti: icssg-prueth: Add missing icss_iep_put to
 error path
Content-Language: en-US
To:     "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>,
        Wojciech Drewek <wojciech.drewek@intel.com>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?S0tIanFOQU9oRytxR2JNYkkxRjNhMC9Ccldsa09CTFFoZTdDNkRnWHRhYytu?=
 =?utf-8?B?SUgxSTlkcmEwVjhzZGpndms5alpHWk1Bd1VKRGlqdWVZWWJJVkdDMFRaVUVS?=
 =?utf-8?B?SEVoYVBydnpibHorM09HZXcrR3llUDE5cHFrL0dPSGVHZXZNUkNxZmNQbTRw?=
 =?utf-8?B?OUw1TUZRS21KNTFyRWhDTkg1QWFNQSs2VG13Zi80czM0bDhmdDFoUXV5VUxu?=
 =?utf-8?B?UzhEeDBXdWZKOWl1Wms2alRCTkcwRTRYbnA5c2dKd2pqaTQ5R2IxdmNMZTU0?=
 =?utf-8?B?SUVwWDFuRUpEUFp0Wk9QV1FmT2wrR2ZUR2hxbHpkUzNZZE44TEVGaW9OMjFD?=
 =?utf-8?B?cDhrNlo2TFhBbk9raFJPNGhJeUhLNVhtN1ZpbjJHaFhWY0V6Y3NZSmlseFZP?=
 =?utf-8?B?aVFEN1U0TDRQS0NUUEtJNXB4MzI3TXVyQzVnSEp4Y3F5bHlGMlVQemg1ejRh?=
 =?utf-8?B?WTZiY2tBY0tod2srazRmMy9Rem5wdG5vZnprVHphZm9OTzRFdEFVZ2lVcytZ?=
 =?utf-8?B?cmlzbGFtai8rRVRXT1U4bkpTa245ZUhnSjU4NS9DN0p1TjVqMkx3SGxUMFhk?=
 =?utf-8?B?dlVJRW1JVDVocVJqUFhFbERQaGJQNkZzclFKS2pTSWdYUHZMdUhnUHFLa3NL?=
 =?utf-8?B?bW1hTU1zc3krUndzOTArMUFNKy8vSGJsWmluQkRaMXFCZjMwQUxKSjkzUlJU?=
 =?utf-8?B?VG9uL1FxdHJUb1NsdHR4NTNCdzBEQ0d4dncvSFdJaUxFTlV0UFlhczdmRytv?=
 =?utf-8?B?cXFyaEVtbGZ1eFJQc3IzWUVNQm55THNXYXQzOEhOR0NsVTlYT0crWFNyUjV0?=
 =?utf-8?B?SXBnR3JmZEtPYlhFMFM2dHRrZGk4NWUzdm9qTmdZUm9jbkRBZkUxcVZzZWxZ?=
 =?utf-8?B?VEY0cmdLS2pxeC9PdE9OdWc4UTlTUUcycmIvSWxHWldTcnYwNFZTK1o2dGFu?=
 =?utf-8?B?cGJ3TXE3eXdJVmFJUEdPc1RzNlhuMkxpdVpCVGJrMkw2Zi9qdFhvbkpTYXFJ?=
 =?utf-8?B?cUpYQThvN21FdDFxbjl6N241elU3RnB5amduQzh5MXYzV3pRU1dFVllCTmV1?=
 =?utf-8?B?RlV4TzV1SXlqdEdQNXV4T3F2MVAwSXA5Q2NPQm1CS3MxaUorMS9oMFVrMWJy?=
 =?utf-8?B?NHlSRFJaWU04a0dPU21DY2IxYkFyZEJFVi9RZ2VyandsWDQ2K0ZTWEtHbG01?=
 =?utf-8?B?amRyL3kxd29UWEN1dzFrWXNReHdFUTIzb280K2F5VUV3RU82bXQ5dzRkVlNV?=
 =?utf-8?B?THMyZzhJU09GdjdhNlFqazBKSkY4SDNMaTJsaHJycXkvU0VCK2o1dEc3bjRh?=
 =?utf-8?B?czZ5MUMwMTErQm91cktGOEUxbTY3RTNGY1NwTDVkS0p5VHlwWFc4ZjVhNm9E?=
 =?utf-8?B?RFlIWmpDS28vYUlkK3pyd2FvOFFweXRVaFEwM3BhYVdTZC81RXN6Sy85Kzlo?=
 =?utf-8?B?emN2aUNzVyt6cUsyUGk1ZHJkUkpYWWZCelgyQWdwZXVhRE43WjdyL1JIeDE0?=
 =?utf-8?B?V2lQQ3VCYnhEdGozaURKSTQrZUoxbkhkOWpwNnhnL2VxdldHdGhQaEhHeHI5?=
 =?utf-8?B?RWxjTDBvdHVFakc2ZWZ4YURabHF6cG90WkxxYmtadWx1VlJ5NEk1NHBEdENw?=
 =?utf-8?B?QXJXZ2VRYncrdXhmZWFOWThERG9ISlBJdkMrQ01zUEtPdWk5SmJoVklSWndT?=
 =?utf-8?B?dG83L3o1Q0YxZVh3RkovMXg1Sm43K2I2b2l5RXBnTHkrSklRUmhaQ0FhUXJh?=
 =?utf-8?B?NXBBa2tLa2lzS1VnaEY3bTN3bDNOMXZScVRUSGZzOUlVeG9CMXV0Y1BBc1NT?=
 =?utf-8?B?ZStkamZ2YnFFMjN0S3FKcURqZTJ3WlAwSmtYa003WkNyWlZFNmpJWVFLWENq?=
 =?utf-8?B?KzJyamx2SUxHNEwyY1NYektuKytRcng5NjJQaHQza1JZbDRPMzd4dExzbWx1?=
 =?utf-8?B?eFZMWHlaMytrTWpxbVh2RUh3Q1hTVVR2YURjQnVZVmY4YU5lR0NlM3U2ODh2?=
 =?utf-8?B?UG9DOVR4bnFPNXEwalpaUVZDL3k3cjV4ZDltWUFoWXFQcW9JbC93ZDdRb05K?=
 =?utf-8?B?aFhpSnIwYVA1UVV6eEE5bTFWeGlYT3MxbjhBQU8rc2taTWUxVUtTZkNGaTRJ?=
 =?utf-8?Q?BnaSEiLcKdCRR85/tz2IPna2T?=
X-OriginatorOrg: siemens.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 416ee883-df29-47cf-00bc-08dbdebe30ab
X-MS-Exchange-CrossTenant-AuthSource: AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Nov 2023 11:47:44.5926
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 38ae3bcd-9579-4fd4-adda-b42e1495d55a
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: NtAUmg4Ny/h0J5KBETjfqAO9hCdc51gPjX9Cee2bhWqXPRR2VaOZ6+Pbr2gH8nd7cliYa6REIgB4TL5qq+5z4g==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS4PR10MB5370
X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED,
	DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,
	MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE
	autolearn=unavailable autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on groat.vger.email
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (groat.vger.email [0.0.0.0]); Mon, 06 Nov 2023 03:48:01 -0800 (PST)

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>
---

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,
-- 
2.35.3