From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 3C7123F4DDB; Wed, 20 May 2026 17:00:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779296449; cv=none; b=ue2MMbLcM5XWhvhAt7XMEbboXK1dGG8uXinF7DuzRObDmfh639HRAac/HPdKoZdJ+rYnLCjPphYJCHl/5vXIEUlaFZx5hbNgJkirgyj+lqDNN5ULVBZhBDGwRB/S7/XFFtsLUp/zuJy2IfGEKzB5VLRzy0a6n3KdVWqsDeMfi4I= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779296449; c=relaxed/simple; bh=m5ynbNR5jAZZhe4ilD5FMNl++/E9SNCMTdxFQZ4H5DY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=bQToDW/nTZXziptvJAJ8OpHsbCZDHjfVHLzXqy11/faXKfDGMngvDUOCIDErReUHGtZvwKdL/Xznl+ZOlrpj/L3wj/Z9ULgpBhcWq4G2fTEbHEs2WGhA/dvrHL76s07MJ1RI2jUYy18KJLxQMcoR0O7DN/wuP6G+rEuzQTVxqbA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=wMnrCJaq; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="wMnrCJaq" Received: by smtp.kernel.org (Postfix) with ESMTPSA id A19231F000E9; Wed, 20 May 2026 17:00:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1779296448; bh=v2/IjBFSHN2Mh0cg2XG4DangyAldjuaUZNYL0OdG5k4=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=wMnrCJaqHRI2tZEaQ6AOsw1vESldzFT5hy6u8+SavYm15tJyW3uRe543m650l9noq oQ8IQ+6NDrIU35Xv9klWXj4xxmqHExha6Afc4IQE8sRjAAw1ujHHluKTK3bKbbCJ88 a7y9IsqOkcUqynkheQqUdbscl6XoYeGs3H3Qszdg= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Matt Vollrath , Avigail Dahan , Jacob Keller , Jakub Kicinski , Sasha Levin Subject: [PATCH 7.0 0803/1146] e1000e: Unroll PTP in probe error handling Date: Wed, 20 May 2026 18:17:33 +0200 Message-ID: <20260520162206.401103815@linuxfoundation.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260520162148.390695140@linuxfoundation.org> References: <20260520162148.390695140@linuxfoundation.org> User-Agent: quilt/0.69 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 7.0-stable review patch. If anyone has any objections, please let me know. ------------------ From: Matt Vollrath [ Upstream commit aa3f7fe409350857c25d050482a2eef2cfd69b58 ] 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 Tested-by: Avigail Dahan Signed-off-by: Jacob Keller Link: https://patch.msgid.link/20260416-iwl-net-submission-2026-04-14-v2-12-686c33c9828d@intel.com Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- drivers/net/ethernet/intel/e1000e/netdev.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c index 9befdacd67301..7ce0cc8ab8f4c 100644 --- a/drivers/net/ethernet/intel/e1000e/netdev.c +++ b/drivers/net/ethernet/intel/e1000e/netdev.c @@ -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); -- 2.53.0