From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6D02E27CB12; Wed, 23 Apr 2025 14:51:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745419871; cv=none; b=Cx1nS/OzRb/G5WuVrNM3zCtz149gobMxWONsQUaPX8ff9knwHrCSz44N4iIpVXLiTDdBx/MKnv8XgUM/EXhR6PgUYO+gaQ/R5VVE+yxvCQwivOElIJYANOyBaHNtj/KxMLiBUpCeXqC6KihUVx/rtvHAwCG6UxvuHvSAKNJ8Khw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745419871; c=relaxed/simple; bh=il0PPzXMiym9fA1IcrT3C7tzOOrI+aAkYSoYClgXnKk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=u0j58l4Db3Bq00rVFzCNSbVYX/gr1lCZUCcLzX+2VW2BbiUxyZUVJDVnNO9F4+e4yVAS5AHmXHl0OLPcxd+5P4IY7bbZAPojdQnnNCxXxqS4EE7RUUScdZNeGljx2gVXB1iWg51R/OmJfb/cJEjWbWgosIlL8e5vo+tgmLYeya4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=IkI1hhg9; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="IkI1hhg9" Received: by smtp.kernel.org (Postfix) with ESMTPSA id F2D74C4CEE2; Wed, 23 Apr 2025 14:51:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1745419871; bh=il0PPzXMiym9fA1IcrT3C7tzOOrI+aAkYSoYClgXnKk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=IkI1hhg9171h4ZzQ4yrAajT8O2ck0mjmu7qjhmv3h7vIvK++UhbEHB+YwRoaE818f onVm8g5VqpAaNMwUlzBKvDv2U9YI5t7yB1QQ3X/cD8YrqqWVLwRv8Q/PIEGfVXrXgH duaKpI27cSe4TB568uGknbJ0j8tw+DCumh9lRUpM= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Christopher S M Hall , Corinna Vinschen , Jacob Keller , Mor Bar-Gabay , Vinicius Costa Gomes , Tony Nguyen , Sasha Levin Subject: [PATCH 6.14 037/241] igc: cleanup PTP module if probe fails Date: Wed, 23 Apr 2025 16:41:41 +0200 Message-ID: <20250423142622.029592049@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250423142620.525425242@linuxfoundation.org> References: <20250423142620.525425242@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.14-stable review patch. If anyone has any objections, please let me know. ------------------ From: Christopher S M Hall [ Upstream commit 1f025759ba394dd53e434d2668cb0597886d9b69 ] 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 Reviewed-by: Corinna Vinschen Signed-off-by: Jacob Keller Tested-by: Mor Bar-Gabay Acked-by: Vinicius Costa Gomes Signed-off-by: Tony Nguyen Signed-off-by: Sasha Levin --- 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 daf2a24ead037..80831c57f7509 100644 --- a/drivers/net/ethernet/intel/igc/igc_main.c +++ b/drivers/net/ethernet/intel/igc/igc_main.c @@ -7230,6 +7230,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.39.5