From: Christopher S M Hall <christopher.s.hall@intel.com>
To: intel-wired-lan@lists.osuosl.org
Cc: david.zage@intel.com, vinicius.gomes@intel.com,
netdev@vger.kernel.org, rodrigo.cadore@l-acoustics.com,
vinschen@redhat.com
Subject: [Intel-wired-lan] [PATCH iwl-net v3 5/6] igc: Cleanup PTP module if probe fails
Date: Wed, 6 Nov 2024 18:47:21 +0000 [thread overview]
Message-ID: <20241106184722.17230-6-christopher.s.hall@intel.com> (raw)
In-Reply-To: <20241106184722.17230-1-christopher.s.hall@intel.com>
Make sure that the PTP module is cleaned up if the igc_probe() fails by
calling igc_ptp_stop() on exit.
Fixes: d89f88419f99 ("igc: Add skeletal frame for Intel(R) 2.5G Ethernet Controller support")
Signed-off-by: Christopher S M Hall <christopher.s.hall@intel.com>
---
drivers/net/ethernet/intel/igc/igc_main.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/net/ethernet/intel/igc/igc_main.c b/drivers/net/ethernet/intel/igc/igc_main.c
index 6e70bca15db1..cc89b72c85af 100644
--- a/drivers/net/ethernet/intel/igc/igc_main.c
+++ b/drivers/net/ethernet/intel/igc/igc_main.c
@@ -7169,6 +7169,7 @@ static int igc_probe(struct pci_dev *pdev,
err_register:
igc_release_hw_control(adapter);
+ igc_ptp_stop(adapter);
err_eeprom:
if (!igc_check_reset_block(hw))
igc_reset_phy(hw);
--
2.34.1
next prev parent reply other threads:[~2024-11-06 18:58 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-11-06 18:47 [Intel-wired-lan] [PATCH iwl-net v3 0/6] igc: Fix PTM timeout Christopher S M Hall
2024-11-06 18:47 ` [Intel-wired-lan] [PATCH iwl-net v3 1/6] igc: Ensure the PTM cycle is reliably triggered Christopher S M Hall
2024-11-06 18:47 ` [Intel-wired-lan] [PATCH iwl-net v3 2/6] igc: Lengthen the hardware retry time to prevent timeouts Christopher S M Hall
2024-11-06 23:13 ` Paul Menzel
2024-11-06 23:53 ` Hall, Christopher S
2024-11-07 5:48 ` Paul Menzel
2024-11-07 5:56 ` Paul Menzel
2024-11-06 18:47 ` [Intel-wired-lan] [PATCH iwl-net v3 3/6] igc: Move ktime snapshot into PTM retry loop Christopher S M Hall
2024-11-06 18:47 ` [Intel-wired-lan] [PATCH iwl-net v3 4/6] igc: Handle the IGC_PTP_ENABLED flag correctly Christopher S M Hall
2024-11-06 18:47 ` Christopher S M Hall [this message]
2024-11-06 18:47 ` [Intel-wired-lan] [PATCH iwl-net v3 6/6] igc: Add lock preventing multiple simultaneous PTM transactions Christopher S M Hall
2024-11-12 15:39 ` [Intel-wired-lan] [PATCH iwl-net v3 0/6] igc: Fix PTM timeout Corinna Vinschen
2025-01-08 11:10 ` Corinna Vinschen
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=20241106184722.17230-6-christopher.s.hall@intel.com \
--to=christopher.s.hall@intel.com \
--cc=david.zage@intel.com \
--cc=intel-wired-lan@lists.osuosl.org \
--cc=netdev@vger.kernel.org \
--cc=rodrigo.cadore@l-acoustics.com \
--cc=vinicius.gomes@intel.com \
--cc=vinschen@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