Skip to contentSkip to conversation

e1000e: Unroll PTP in probe error handling

PATCH In review Matt Vollrath 2 participants 3 messages Apr 13 – Apr 14

Subsystems (3)
Network drivers Stable branch Intel Ethernet
lore
Share & tools
lore

Matt Vollrath

author
#0 lore raw

PATCH v2 1/1 e1000e: Unroll PTP in probe error handling

If probe fails after registering the PTP clock and its delayed work, these resources must be released.

This was not an issue until a 2016 fix moved the e1000e_ptp_init() call before the jump to err_register.

Fixes aa524b66c5ef ("e1000e: don't modify SYSTIM registers during SIOCSHWTSTAMP ioctl")
Signed-off-by Matt Vollrath <[email protected]>
Tested-by Avigail Dahan <[email protected]>
---
 drivers/net/ethernet/intel/e1000e/netdev.c | 1 +
 1 file changed, 1 insertion(+)
drivers/net/ethernet/intel/e1000e/netdev.c +1 -0
index 9befdacd6730..7ce0cc8ab8f4 100644
@@ -7706,6 +7706,7 @@ static int e1000_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 err_register:
 	if (!(adapter->flags & FLAG_HAS_AMT))
 		e1000e_release_hw_control(adapter);
+	e1000e_ptp_remove(adapter);
 err_eeprom:
 	if (hw->phy.ops.check_reset_block && !hw->phy.ops.check_reset_block(hw))
 		e1000_phy_hw_reset(&adapter->hw);
Signature · 7 lines
2.43.0

Changes:
v2:
* Apply the correct Fixes tag
* Target iwl-net
* Cc stable
#1 lore raw

On 2026-04-13 2:03 AM, Matt Vollrath wrote:

Hey Matt,

Thanks for the patch!

Apologies but it seems I didn't explain fully where the changelog should go, same goes for the Cc: stable as it should be inserted into the commit msg as a tag, see example below.

Quoted 10 lines

If probe fails after registering the PTP clock and its delayed work, these resources must be released.

This was not an issue until a 2016 fix moved the e1000e_ptp_init() call before the jump to err_register.

Fixes aa524b66c5ef ("e1000e: don't modify SYSTIM registers during SIOCSHWTSTAMP ioctl")
Signed-off-by Matt Vollrath <[email protected]>
Tested-by Avigail Dahan <[email protected]>

---

Changelog should go _here_, not below the:

Signature · 31 lines
2.43.0

and should also have the --- afterwards. So using this patch submission as an example your commit msg + changelog should look like the following:

If probe fails after registering the PTP clock and its delayed work,
these resources must be released.

This was not an issue until a 2016 fix moved the e1000e_ptp_init() call
before the jump to err_register.

Fixes: aa524b66c5ef ("e1000e: don't modify SYSTIM registers during SIOCSHWTSTAMP ioctl")
Cc: [email protected]
Signed-off-by: Matt Vollrath <[email protected]>
Tested-by: Avigail Dahan <[email protected]>
---
Changes:
v2:
* Apply the correct Fixes tag
* Target iwl-net
* Cc stable
---

 drivers/net/ethernet/intel/e1000e/netdev.c | 1 +
 1 file changed, 1 insertion(+)

<snip of the rest of the diff/>

Once again sorry for not saying it more clearly before.

Best regards
~Dawid
author
#2 lore raw
Quoted 1 line · Dawid Osuchowski

Apologies but it seems I didn't explain fully where the changelog should go, same goes for the Cc: stable as it should be inserted into the commit msg as a tag, see example below.

Thanks Dawid, I had figured out the changelog after sending this by looking at other patches, but didn't see anyone else adding the Cc tag. mv